修改 下单 bug 增加 临时券详情接口

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

@@ -509,7 +509,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
                 orderVo.getStatus(), now, orderId, now, now
         });
         queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_STORE_ORDER_OPERA.getKey(),
-                SqlMapping.gets(sqls, sqlsOrder, sqlsOrderSku,sqlsMail));
+                SqlMapping.gets(sqls, sqlsOrder, sqlsOrderSku, sqlsMail));
         //添加日志
         queueUtils.sendMsgByRedis(
                 MQConst.GoblinQueue.GOBLIN_STORE_ORDER_OPERA.getKey(),
@@ -535,13 +535,13 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
         vo.setMailNo(mailNo);
         vo.setMailId(mailId);
         vo.setOrderId(orderId);
-        redisUtils.changeGoblinMail(orderId,vo);
-        mongoUtils.updateGoblinMailVo(mailId,vo);
+        redisUtils.changeGoblinMail(orderId, vo);
+        mongoUtils.updateGoblinMailVo(mailId, vo);
         //添加日志
         queueUtils.sendMsgByRedis(
                 MQConst.GoblinQueue.GOBLIN_STORE_ORDER_OPERA.getKey(),
                 SqlMapping.get("goblin_order.mail.update",
-                        vo.getMailNo(),LocalDateTime.now(),vo.getMailId()
+                        vo.getMailNo(), LocalDateTime.now(), vo.getMailId()
                 )
         );
         return ResponseDto.success();
@@ -552,7 +552,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
         LocalDateTime now = LocalDateTime.now();
         String nowStr = DateUtil.getNowTime();
         log.info("refundCallback订单退款回调参数: [RefundCallbackParam={}]", refundCallbackParam);
-        GoblinBackOrderVo backOrderVo = mongoUtils.getGoblinBackOrderVoByBackCode(refundCallbackParam.getRefundCode());
+        GoblinBackOrderVo backOrderVo = mongoUtils.getGoblinBackOrderVoByBackCode(refundCallbackParam.getOrderRefundCode());
         if (backOrderVo == null) {
             log.info("refundCallback: 退款订单查询失败，编号{}", refundCallbackParam.getOrderRefundCode());
             return "fail";
@@ -566,7 +566,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
             return "success";
         }
         Integer status = refundCallbackParam.getStatus();
-        if (1 == status) { // 退款成功
+        if (1 == status && (backOrderVo.getStatus() == 0 || backOrderVo.getStatus() == 10)) { // 退款成功
             LinkedList<String> sqls = CollectionUtil.linkedListString();
             LinkedList<Object[]> sqlsOrder = CollectionUtil.linkedListObjectArr();
             LinkedList<Object[]> sqlsOrderSku = CollectionUtil.linkedListObjectArr();
@@ -584,7 +584,6 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
             }
             backOrderVo.setStatus(GoblinStatusConst.Status.ORDER_BACK_STATUS_2.getValue());
             backOrderVo.setRefundAt(nowStr);
-            List<GoblinOrderSkuVo> skuVoList = ObjectUtil.getGoblinOrderSkuVoArrayList();
             for (GoblinBackOrderSkuVo backOrderSkuVo : backOrderSkuVos) {
                 GoblinOrderSkuVo orderSkuVo = redisUtils.getGoblinOrderSkuVo(backOrderSkuVo.getOrderSkuId());
                 orderSkuVo.setPriceRefund(orderSkuVo.getPriceRefund() == null ? BigDecimal.ZERO : orderSkuVo.getPriceRefund().add(price));
@@ -592,9 +591,6 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
                     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(backOrderSkuVo.getOrderSkuId(), orderSkuVo);
@@ -625,8 +621,10 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
             }
             //redis
             redisUtils.setGoblinOrder(orderId, orderVo);
+            redisUtils.setBackOrderVo(backOrderVo.getBackOrderId(), backOrderVo);
             //mongo
             mongoUtils.updateGoblinStoreOrderVo(orderId, orderVo);
+            mongoUtils.updateGoblinBackOrderVo(backOrderVo.getBackOrderId(), backOrderVo);
             //mysql
             sqlsOrder.add(new Object[]{
                     orderVo.getPriceRefund(), orderVo.getStatus(), now,