Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/constant/GoblinStatusConst.java

@@ -45,6 +45,7 @@ public class GoblinStatusConst {
         ORDER_LOG_STATUS_17(17, "修改收货地址"),
 
         ORDER_LOG_STATUS_20(20, "商家发起退款"),
+        ORDER_LOG_STATUS_201(201, "商家同意退款"),
         ORDER_LOG_STATUS_21(21, "退款申请"),
         ORDER_LOG_STATUS_22(22, "退款成功"),
         ORDER_LOG_STATUS_23(23, "退款拒绝"),
@@ -54,6 +55,19 @@ public class GoblinStatusConst {
         ORDER_LOG_STATUS_27(27, "待收货"),
         ORDER_LOG_STATUS_28(28, "退货完成"),
         ORDER_LOG_STATUS_29(29, "退款拒绝"),
+
+
+        ORDER_BACK_STATUS_0(0, "商家发起退款"),
+        ORDER_BACK_STATUS_1(1, "退款申请(用户发送退款请求)"),
+        ORDER_BACK_STATUS_2(2, "退款成功(商家同意退款)"),
+        ORDER_BACK_STATUS_3(3, "退款拒绝(商家拒绝退款)"),
+        ORDER_BACK_STATUS_4(4, "退货申请(用户发起退货请求)"),
+        ORDER_BACK_STATUS_5(5, "5-退货拒绝(商家拒绝退货)"),
+        ORDER_BACK_STATUS_6(6, "退货审核通过等待用户填写物流"),
+        ORDER_BACK_STATUS_7(7, "待收货"),
+        ORDER_BACK_STATUS_8(8, "退货完成"),
+        ORDER_BACK_STATUS_9(9, "退款拒绝"),
+        ORDER_BACK_STATUS_10(10, "退款失败"),
         ;
 
         private final int value;

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/manage/IGoblinStoreOrderService.java

@@ -32,5 +32,5 @@ public interface IGoblinStoreOrderService {
 
     ResponseDto<Boolean> refundOrderSku(String orderId, String orderSkuId, BigDecimal price);
 
-    ResponseDto<Boolean> refundSyncOrder(RefundCallbackParam refundCallbackParam);
+    String refundSyncOrder(RefundCallbackParam refundCallbackParam);
 }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/manage/GoblinStoreOrderController.java

@@ -124,7 +124,7 @@ public class GoblinStoreOrderController {
 
     @ApiOperation(value = "退款回调")
     @PostMapping(value = "refundSyncOrder")
-    public ResponseDto<Boolean> refundSyncOrder(RefundCallbackParam refundCallbackParam) {
+    public String refundSyncOrder(RefundCallbackParam refundCallbackParam) {
         return goblinStoreOrderService.refundSyncOrder(refundCallbackParam);
     }
 //    @ApiOperation(value = "发货")

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinFrontServiceImpl.java

@@ -270,7 +270,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
             goblinFrontSelectGoodVo.setCount(ids.length);
             //
             ArrayList<GoblinGoodsInfoVo> goblinGoodsInfoVoArrayList= ObjectUtil.getGoblinGoodsInfoVos();
-            for(int i=0;i<=end;i++){
+            for(int i=0;i<end;i++){
                if (i>=start){
                    GoblinGoodsInfoVo goblinGoodsInfoVo= goblinRedisUtils.getGoodsInfoVo(ids[i]);
                    goblinGoodsInfoVoArrayList.add(goblinGoodsInfoVo);

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinMongoUtils.java

@@ -54,7 +54,7 @@ public class GoblinMongoUtils {
 
     public List<GoblinMgtCategorySpecVo> getCategorySpecVos(String cateId) {
         return mongoTemplate.find(Query.query(Criteria.where("cateId").is(cateId).and("delFlg").is("0")),
-                GoblinMgtCategorySpecVo.class,GoblinMgtCategorySpecVo.class.getSimpleName());
+                GoblinMgtCategorySpecVo.class, GoblinMgtCategorySpecVo.class.getSimpleName());
     }
 
     /* ---------------------------------------- 标签数据源 ---------------------------------------- */
@@ -463,6 +463,11 @@ public class GoblinMongoUtils {
         return mongoTemplate.insert(vo, GoblinBackOrderVo.class.getSimpleName());
     }
 
+    //获取 订单退款数据根据orderCode
+    public GoblinBackOrderVo getGoblinBackOrderVoByBackCode(String backCode) {
+        return mongoTemplate.findOne(Query.query(Criteria.where("backCode").is(backCode)), GoblinBackOrderVo.class, GoblinBackOrderVo.class.getSimpleName());
+    }
+
     //资金列表
     public HashMap<String, Object> moneyGetSpuList(String spuName, String st, String et, String storeId, int page) {
         //查询销量
@@ -560,7 +565,7 @@ public class GoblinMongoUtils {
     }
 
     //商品订单操作日志列表
-    public HashMap<String, Object> storeOrderList(String storeId,Integer page, String orderCode, String cst, String cet, String expressContacts, String phone, Integer status) {
+    public HashMap<String, Object> storeOrderList(String storeId, Integer page, String orderCode, String cst, String cet, String expressContacts, String phone, Integer status) {
         //查询销量
         int size = 20;
         int skipCount = ((page - 1) * size);
@@ -571,13 +576,13 @@ public class GoblinMongoUtils {
         if (orderCode != null) {
             criteria = criteria.and("orderCode").is(orderCode);
         }
-        if(phone!= null){
+        if (phone != null) {
             criteria = criteria.and("userMobile").is(phone);
         }
-        if(status!= null){
+        if (status != null) {
             criteria = criteria.and("status").is(status);
         }
-        if(expressContacts!= null){
+        if (expressContacts != null) {
             criteria = criteria.and("orderAttrVo.expressContacts").is(expressContacts);
         }
         Query query = Query.query(criteria);

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinRedisUtils.java

@@ -606,4 +606,14 @@ public class GoblinRedisUtils {
         redisUtil.set(redisKey, vo);
     }
 
+    //覆盖 获取订单vo
+    public GoblinBackOrderVo getBackOrderVo(String backOrderId) {
+        String redisKey = GoblinRedisConst.REDIS_GOBLIN_ORDER_BACK.concat(backOrderId);
+        Object obj = redisUtil.get(redisKey);
+        if (obj == null) {
+            return null;
+        } else {
+            return (GoblinBackOrderVo) obj;
+        }
+    }
 }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/resources/sqlmap.properties

@@ -60,3 +60,4 @@ goblin_order.store.orderExpressPrice=UPDATE goblin_store_order SET price_modify
 goblin_order.store.backOrder=INSERT INTO goblin_back_order (`back_order_id`,`back_code`,`order_id`,`order_code`,`store_id`,`user_id`,`sku_id_nums`,`type`,`reason`,`describes`,`real_back_price`,`status`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,)
 goblin_order.store.refundPrice=UPDATE goblin_store_order SET price_refund = ? ,status = ? , updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.store.refundSkuPrice=UPDATE goblin_order_sku SET price_refund = ? ,status = ? ,  updated_at = ? WHERE order_sku_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+goblin_order.store.refundBackOrder=UPDATE goblin_back_order SET status = ? , updated_at = ? WHERE back_order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)