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/service/impl/manage/GoblinStoreOrderServiceImpl.java

 package com.liquidnet.service.goblin.service.impl.manage;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.base.ResponseDto;
@@ -17,11 +18,15 @@ import com.liquidnet.service.goblin.util.GoblinMongoUtils;
 import com.liquidnet.service.goblin.util.GoblinRedisUtils;
 import com.liquidnet.service.goblin.util.ObjectUtil;
 import com.liquidnet.service.goblin.util.QueueUtils;
+import com.mongodb.BasicDBObject;
+import com.mongodb.client.result.UpdateResult;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -340,12 +345,12 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
         goblinBackOrder.setOrderCode(orderVo.getOrderCode());
         goblinBackOrder.setStoreId(orderVo.getStoreId());
         goblinBackOrder.setUserId(orderVo.getUserId());
-        goblinBackOrder.setSkuIdNums("");
+        goblinBackOrder.setSkuIdNums(orderSkuId);
         goblinBackOrder.setType(GoblinStatusConst.Type.BACK_TYPE_1.getValue());
         goblinBackOrder.setReason(GoblinStatusConst.Type.BACK_REASON_TYPE_8.getDesc());
         goblinBackOrder.setDescribes("店铺退款");
         goblinBackOrder.setRealBackPrice(price);
-        goblinBackOrder.setStatus(GoblinStatusConst.Status.ORDER_LOG_STATUS_20.getValue());
+        goblinBackOrder.setStatus(GoblinStatusConst.Status.ORDER_BACK_STATUS_0.getValue());
         goblinBackOrder.setCreatedAt(now);
         GoblinBackOrderVo backOrderVo = GoblinBackOrderVo.getNew();
         BeanUtils.copyProperties(goblinBackOrder, backOrderVo);
@@ -355,39 +360,28 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
         backOrderLog.setStatus(GoblinStatusConst.Status.ORDER_LOG_STATUS_22.getValue());
         backOrderLog.setOperationType(GoblinStatusConst.Type.OPERATION_TYPE_2.getValue());
         backOrderLog.setMessage("商户发起：orderSkuId=[" + orderSkuId + "],price=[" + price + "],[refundCode=" + refundCode + "]");
-        GoblinOrderLogVo logVo = GoblinOrderLogVo.getNew();
-        logVo.setOrderId(orderVo.getOrderId());
-        logVo.setOrderCode(orderVo.getOrderCode());
-        logVo.setPayCode(orderVo.getPayCode());
-        if (orderSkuVo.getOrderSkuId().indexOf(GoblinStatusConst.MarketPreStatus.MARKET_PRE_PURCHASE.getValue()) > 0) {
-            logVo.setOrderType("zhengzai");
-        } else {
-            logVo.setOrderType("order");
+        //调用退款
+        String returnString = initRefund(orderVo, price, refundCode);
+        HashMap hashMapResult = JsonUtils.fromJson(returnString, HashMap.class);
+        Boolean success = (Boolean) hashMapResult.get("success");
+        String message = (String) hashMapResult.get("message");
+        if (!success) {
+            backOrderVo.setStatus(GoblinStatusConst.Status.ORDER_BACK_STATUS_10.getValue());
+            backOrderVo.setReason(backOrderVo.getReason() + ",失败原因：" + message);
+            log.error("REFUND DATA = " + returnString);
         }
-        logVo.setStoreId(orderVo.getStoreId());
-        logVo.setSpuId(orderSkuVo.getSpuId());
-        logVo.setSpuName(redisUtils.getGoodsInfoVo(orderSkuVo.getSpuId()).getName());
-        logVo.setSkuId(orderSkuId);
-        logVo.setSkuPriceActual(price.multiply(BigDecimal.valueOf(100)).negate().longValue());
-        logVo.setStatus(GoblinStatusConst.Status.ORDER_LOG_STATUS_22.getValue());
-        logVo.setOperationId(uid);
-        Map token = CurrentUtil.getTokenClaims();
-        logVo.setOperationName(StringUtils.defaultString(((String) token.get("nickname")), ""));
-        logVo.setOperationType(GoblinStatusConst.Type.OPERATION_TYPE_2.getValue());
-        logVo.setCreatedAt(now);
         //redis
         redisUtils.setBackOrderVo(backOrderVo.getBackOrderId(), backOrderVo);
         //mongo
         mongoUtils.insertGoblinBackOrderVo(backOrderVo);
-        mongoUtils.insertGoblinOrderLogVo(logVo);
         //添加退款
         queueUtils.sendMsgByRedis(
                 MQConst.GoblinQueue.GOBLIN_STORE_ORDER_OPERA.getKey(),
                 SqlMapping.get("goblin_order.store.backOrder",
-                        goblinBackOrder.getBackOrderId(),goblinBackOrder.getBackCode(),goblinBackOrder.getOrderId(),
-                        goblinBackOrder.getOrderCode(),goblinBackOrder.getStoreId(),goblinBackOrder.getUserId(),
-                        goblinBackOrder.getSkuIdNums(),goblinBackOrder.getType(),goblinBackOrder.getReason(),
-                        goblinBackOrder.getDescribes(),goblinBackOrder.getRealBackPrice(),goblinBackOrder.getStatus(),
+                        goblinBackOrder.getBackOrderId(), goblinBackOrder.getBackCode(), goblinBackOrder.getOrderId(),
+                        goblinBackOrder.getOrderCode(), goblinBackOrder.getStoreId(), goblinBackOrder.getUserId(),
+                        goblinBackOrder.getSkuIdNums(), goblinBackOrder.getType(), goblinBackOrder.getReason(),
+                        goblinBackOrder.getDescribes(), goblinBackOrder.getRealBackPrice(), goblinBackOrder.getStatus(),
                         goblinBackOrder.getCreatedAt()
                 )
         );
@@ -399,52 +393,103 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
                         backOrderLog.getMessage(), backOrderLog.getOperationName(), backOrderLog.getStatus(), now
                 )
         );
-        //调用退款
-        String returnString = initRefund(orderVo, price, refundCode);
-        HashMap hashMapResult = JsonUtils.fromJson(returnString, HashMap.class);
-        Boolean success = (Boolean) hashMapResult.get("success");
         if (success) {
-//            orderSkuVo.setPriceRefund(orderSkuVo.getPriceRefund().add(price));
-//            orderVo.setPriceRefund(orderVo.getPriceRefund().add(price));
-//            if (orderSkuVo.getPriceRefund().compareTo(orderSkuVo.getSkuPriceActual()) == 0) {
-//                orderSkuVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_6.getValue());
-//            }
-//            if (orderVo.getPriceRefund().compareTo(orderVo.getPriceActual()) == 0) {
-//                orderSkuVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_6.getValue());
-//            }
-            //redis
-//            redisUtils.setGoblinOrder(orderId, orderVo);
-//            redisUtils.setGoblinOrderSku(orderSkuId, orderSkuVo);
-            //mongo
-//            mongoUtils.updateGoblinStoreOrderVo(orderId, orderVo);
-//            mongoUtils.updateGoblinOrderSkuVo(orderSkuId, orderSkuVo);
-            //mysql
-//            LinkedList<String> sqls = CollectionUtil.linkedListString();
-//            LinkedList<Object[]> sqlsOrder = CollectionUtil.linkedListObjectArr();
-//            LinkedList<Object[]> sqlsOrderSku = CollectionUtil.linkedListObjectArr();
-//            sqls.add(SqlMapping.get("goblin_order.store.refundPrice"));
-//            sqls.add(SqlMapping.get("goblin_order.store.refundSkuPrice"));
-//            sqlsOrder.add(new Object[]{
-//                    orderVo.getPriceRefund(), orderVo.getStatus(), now,
-//                    orderId, now, now
-//            });
-//            sqlsOrderSku.add(new Object[]{
-//                    orderSkuVo.getPriceRefund(), orderSkuVo.getStatus(), now,
-//                    orderSkuId, now, now
-//            });
-//            queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_STORE_ORDER_OPERA.getKey(),
-//                    SqlMapping.gets(sqls, sqlsOrder, sqlsOrderSku));
             return ResponseDto.success();
-        } else {
-            log.error("REFUND DATA = " + returnString);
-            return ResponseDto.failure("退款失败");
         }
+        return ResponseDto.failure("退款失败:" + message);
     }
 
     @Override
-    public ResponseDto<Boolean> refundSyncOrder(RefundCallbackParam refundCallbackParam) {
+    public String refundSyncOrder(RefundCallbackParam refundCallbackParam) {
+        LocalDateTime now = LocalDateTime.now();
         log.info("refundCallback订单退款回调参数: [RefundCallbackParam={}]", refundCallbackParam);
-        return null;
+        GoblinBackOrderVo backOrderVo = mongoUtils.getGoblinBackOrderVoByBackCode(refundCallbackParam.getRefundCode());
+        if (backOrderVo == null) {
+            log.info("refundCallback: 退款订单查询失败，编号{}", refundCallbackParam.getOrderRefundCode());
+            return "fail";
+        }
+        if (backOrderVo.getStatus() == GoblinStatusConst.Status.ORDER_LOG_STATUS_20.getValue() || backOrderVo.getStatus() == GoblinStatusConst.Status.ORDER_LOG_STATUS_201.getValue()) {
+            log.info("refundCallback: 退款订单已取消，编号{}", refundCallbackParam.getOrderRefundCode());
+            return "fail";
+        }
+        if (backOrderVo.getStatus() == GoblinStatusConst.Status.ORDER_LOG_STATUS_22.getValue()) {
+            log.info("refundCallback: 退款订单已完成，编号{}", refundCallbackParam.getOrderRefundCode());
+            return "success";
+        }
+        Integer status = refundCallbackParam.getStatus();
+        if (1 == status) { // 退款成功
+            LinkedList<String> sqls = CollectionUtil.linkedListString();
+            LinkedList<Object[]> sqlsOrder = CollectionUtil.linkedListObjectArr();
+            LinkedList<Object[]> sqlsOrderSku = CollectionUtil.linkedListObjectArr();
+            LinkedList<Object[]> sqlsBackOrder = CollectionUtil.linkedListObjectArr();
+            sqls.add(SqlMapping.get("goblin_order.store.refundPrice"));
+            sqls.add(SqlMapping.get("goblin_order.store.refundSkuPrice"));
+            sqls.add(SqlMapping.get("goblin_order.store.refundBackOrder"));
+            String orderId = backOrderVo.getOrderId();
+            String[] orderSkuIds = backOrderVo.getSkuIdNums().split(",");
+            BigDecimal price = refundCallbackParam.getRefundPrice();
+            GoblinStoreOrderVo orderVo = redisUtils.getGoblinOrder(orderId);
+            orderVo.setPriceRefund(orderVo.getPriceRefund().add(price));
+            if (orderVo.getPriceRefund().compareTo(orderVo.getPriceActual()) == 0) {
+                orderVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_6.getValue());
+            }
+            backOrderVo.setStatus(GoblinStatusConst.Status.ORDER_BACK_STATUS_2.getValue());
+            for (String orderSkuId : orderSkuIds) {
+                GoblinOrderSkuVo orderSkuVo = redisUtils.getGoblinOrderSkuVo(orderSkuId);
+                orderSkuVo.setPriceRefund(orderSkuVo.getPriceRefund().add(price));
+                if (orderSkuVo.getPriceRefund().compareTo(orderSkuVo.getSkuPriceActual()) == 0) {
+                    orderSkuVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_6.getValue());
+                    String pre = GoblinStatusConst.MarketPreStatus.getPre(orderSkuVo.getSkuId());
+                    String skuId = orderSkuVo.getSkuId();
+                    if (pre != null) {
+                        skuId = orderSkuVo.getSkuId().split(pre)[0];
+                    }
+                    redisUtils.incrSkuStock(pre, skuId, orderSkuVo.getNum());
+                }
+                redisUtils.setGoblinOrderSku(orderSkuId, orderSkuVo);
+                mongoUtils.updateGoblinOrderSkuVo(orderSkuId, orderSkuVo);
+                sqlsOrderSku.add(new Object[]{
+                        orderSkuVo.getPriceRefund(), orderSkuVo.getStatus(), now,
+                        orderSkuId, now, now
+                });
+                GoblinOrderLogVo logVo = GoblinOrderLogVo.getNew();
+                logVo.setOrderId(orderVo.getOrderId());
+                logVo.setOrderCode(orderVo.getOrderCode());
+                logVo.setPayCode(orderVo.getPayCode());
+                if (orderSkuVo.getOrderSkuId().indexOf(GoblinStatusConst.MarketPreStatus.MARKET_PRE_PURCHASE.getValue()) > 0) {
+                    logVo.setOrderType("zhengzai");
+                } else {
+                    logVo.setOrderType("order");
+                }
+                logVo.setStoreId(orderVo.getStoreId());
+                logVo.setSpuId(orderSkuVo.getSpuId());
+                logVo.setSpuName(redisUtils.getGoodsInfoVo(orderSkuVo.getSpuId()).getName());
+                logVo.setSkuId(orderSkuId);
+                logVo.setSkuPriceActual(price.multiply(BigDecimal.valueOf(100)).negate().longValue());
+                logVo.setStatus(GoblinStatusConst.Status.ORDER_LOG_STATUS_22.getValue());
+                logVo.setOperationId(backOrderVo.getUserId());
+                logVo.setOperationType(GoblinStatusConst.Type.OPERATION_TYPE_2.getValue());
+                logVo.setCreatedAt(now);
+                mongoUtils.insertGoblinOrderLogVo(logVo);
+            }
+            //redis
+            redisUtils.setGoblinOrder(orderId, orderVo);
+            //mongo
+            mongoUtils.updateGoblinStoreOrderVo(orderId, orderVo);
+            //mysql
+            sqlsOrder.add(new Object[]{
+                    orderVo.getPriceRefund(), orderVo.getStatus(), now,
+                    orderId, now, now
+            });
+            sqlsBackOrder.add(new Object[]{
+                    backOrderVo.getStatus(), now, backOrderVo.getBackOrderId(), now, now
+            });
+            queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_STORE_ORDER_OPERA.getKey(),
+                    SqlMapping.gets(sqls, sqlsOrder, sqlsOrderSku, sqlsBackOrder));
+        } else if (0 == status) {
+
+        }
+        return "success";
     }
 
     private GoblinOrderOperationLog initLog(String orderId, String uid, LocalDateTime now) {

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)