修改我的券包商品接口

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/docu/db_ln_goblin_initialdata.sql

@@ -629,7 +629,7 @@ create table goblin_store_order
     pay_type             varchar(32)   default '' comment '支付类型[wepay-微信支付|alipay-阿里支付|douyinpay-抖音支付|unionpay-银联支付]',
     device_from          varchar(32)   default '' comment '支付类型来源[wap|js]',
     payment_type         varchar(32)   default '' comment '支付中心返回实际支付类型',
-    payment_id           varchar(32)   default '' comment '支付中心返回支付id',
+    payment_id           varchar(128)   default '' comment '支付中心返回支付id',
     cancel_reason        varchar(256)  default '' comment '取消原因',
     pre_deposit_pay      int           default 0 comment '是否存在预付款[0-不存在|1-存在]',
     source               varchar(32)   default '' comment '订单来源[app|h5|applet]',

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

@@ -36,7 +36,7 @@ public class GoblinStoreBackOrderController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "page", value = "页数"),
             @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "orderBackCode", value = "订单退款编号"),
-            @ApiImplicitParam(type = "form", required = false, dataType = "Integer", name = "type", value = "退款类型[0-全部|1-退款|2-退货|3-退款退货]"),
+            @ApiImplicitParam(type = "form", required = false, dataType = "Integer", name = "type", value = "退款类型[1-退款|2-退货|3-退款退货]"),
             @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "cst", value = "申请起始时间"),
             @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "cet", value = "申请终止时间"),
             @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "orderCode", value = "订单编号"),

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

@@ -132,7 +132,7 @@ public class GoblinAppZhengzaiServiceImpl implements IGoblinAppZhengzaiService {
                 redisUtils.setGoblinOrder(storeOrderVo.getOrderId(), storeOrderVo);
                 mongoUtils.updateGoblinStoreOrderVo(storeOrderVo.getOrderId(), storeOrderVo);
             }
-            queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_ORDER_CREATE_PAY.getKey(),
+            queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_STORE_ORDER_OPERA.getKey(),
                     SqlMapping.gets(sqls, sqlDataOrder, sqlDataSku));
         }
         return ResponseDto.success();
@@ -199,7 +199,7 @@ public class GoblinAppZhengzaiServiceImpl implements IGoblinAppZhengzaiService {
                 //redis
                 redisUtils.setGoblinOrder(storeOrderVo.getOrderId(), storeOrderVo);
                 //mysql
-                queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_ORDER_CREATE_PAY.getKey(),
+                queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_STORE_ORDER_OPERA.getKey(),
                         SqlMapping.get("goblin_order.zhengzai.bind",
                                 uid, now, storeOrderVo.getOrderId(), now, now));
             }

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

@@ -227,6 +227,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
             backOrderSkuVo.setSpuId(orderSkuVo.getSpuId());
             backOrderSkuVo.setSpuName(orderSkuVo.getSpuName());
             backOrderSkuVo.setSkuId(orderSkuVo.getSkuId());
+            backOrderSkuVo.setSkuPic(orderSkuVo.getSkuImage());
             backOrderSkuVo.setSkuName(orderSkuVo.getSkuName());
             backOrderSkuVo.setRefundPrice(orderSkuVo.getSkuPriceActual());
             backOrderSkuVo.setSkuSpecs(orderSkuVo.getSkuSpecs());
@@ -268,8 +269,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
                 backOrderLog.getBackOrderLogId(), backOrderLog.getBackOrderId(), backOrderLog.getOperationType(),
                 backOrderLog.getMessage(), backOrderLog.getOperationName(), backOrderLog.getStatus(), now
         });
-        queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_USER_ORDER_OPERA.getKey(),
-                SqlMapping.get("goblin_order.pay.again", SqlMapping.gets(sqls, applyRefund, orderStatus, orderSkuStatus, refundLog)));
+        queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_USER_ORDER_OPERA.getKey(), SqlMapping.gets(sqls, applyRefund, orderStatus, orderSkuStatus, refundLog));
         return ResponseDto.success();
     }
 
@@ -393,7 +393,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
                     //mongo
                     mongoUtils.updateGoblinStoreOrderVo(orderId, orderVo);
                     //mysql
-                    queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_USER_ORDER_OPERA.getKey(),
+                    queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_ORDER_CREATE_PAY.getKey(),
                             SqlMapping.gets(sqls, sqlDataOrder, sqlDataSku));
                 }
                 //加分

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

@@ -35,6 +35,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
+import static com.liquidnet.commons.lang.util.DateUtil.getNowTime;
 
 @Service
 @Slf4j
@@ -431,6 +432,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             //redis 赋值
             orderVo.setOrderAttrVo(orderAttrVo);
             orderVo.setOrderSkuVoIds(goblinOrderSkuIdList);
+            orderVo.setCreatedAt(getNowTime());
             redisUtils.setGoblinOrder(orderVo.getOrderId(), orderVo);
             redisUtils.setMasterCode(preParam.getOrderMasterCode(), preParam.getOrderIdList().substring(1));
             mongoUtils.insertGoblinStoreOrderVo(orderVo);
@@ -661,7 +663,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                 //mongo
                 mongoUtils.updateGoblinStoreOrderVo(orderId, orderVo);
                 //mysql
-                queueUtils.sendMsgByRedis(MQConst.KylinQueue.SQL_ORDER_CREATE.getKey(),
+                queueUtils.sendMsgByRedis(MQConst.GoblinQueue.GOBLIN_ORDER_CREATE_PAY.getKey(),
                         SqlMapping.gets(sqls, sqlDataOrder, sqlDataSku));
             }
             //发短信

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

@@ -154,7 +154,7 @@ public class GoblinStoreBackOrderServiceImpl implements IGoblinStoreBackOrderSer
         backOrderLog.setOperationType(GoblinStatusConst.Type.OPERATION_TYPE_2.getValue());
         backOrderLog.setMessage("商户退款-同意退款：backOrderId=[" + backOrderId + "]");
         //调用退款
-        GoblinStoreOrderVo orderVo = redisUtils.getGoblinOrder(backOrderId);
+        GoblinStoreOrderVo orderVo = redisUtils.getGoblinOrder(backOrderVo.getOrderId());
         String returnString = initRefund(orderVo, backOrderVo.getRealBackPrice(), backOrderVo.getBackCode());
         HashMap hashMapResult = JsonUtils.fromJson(returnString, HashMap.class);
         Boolean success = (Boolean) hashMapResult.get("success");

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

@@ -537,9 +537,10 @@ 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().add(price));
+                orderSkuVo.setPriceRefund(orderSkuVo.getPriceRefund()==null?BigDecimal.ZERO: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());

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

@@ -867,7 +867,8 @@ public class GoblinMongoUtils {
         query.skip(skipCount).limit(size);
         query.fields().include("backCode").include("orderCode").include("backOrderId").include("type").include("status").include("realBackPrice").include("createdAt")
                 .include("backOrderSkuVos.spuName").include("backOrderSkuVos.skuName").include("backOrderSkuVos.spuPic").include("backOrderSkuVos.skuPic")
-                .include("backOrderSkuVos.skuSpecs");
+                .include("backOrderSkuVos.skuSpecs").include("backOrderSkuVos.skuId").include("backOrderSkuVos.spuId").include("backOrderSkuVos.orderSkuId")
+                .include("backOrderSkuVos.refundPrice");
         List<GoblinBackOrderVo> dataList = mongoTemplate.find(query, GoblinBackOrderVo.class, GoblinBackOrderVo.class.getSimpleName());
         //查询总数量
         Query countQuery = Query.query(criteria);

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

@@ -77,7 +77,7 @@ goblin_order.pay.sku=UPDATE goblin_order_sku SET status = ? ,updated_at = ?  WHE
 #----                   再次支付
 goblin_order.pay.again=UPDATE goblin_store_order SET pay_type = ? ,device_from = ? ,pay_code = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 #----                   订单绑定[正在下单] 出货
-goblin_order.zhengzai.bind=UPDATE goblin_store_order SET uid = ? ,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+goblin_order.zhengzai.bind=UPDATE goblin_store_order SET user_id = ? ,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 goblin_order.zhengzai.push=UPDATE goblin_store_order SET zhengzai_status = ? ,updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 #----                   商铺订单操作
 goblin_order.store.cancel=UPDATE goblin_store_order SET mailNo = ? ,delivery_time = ? , logistics_company = ? , status = ? , updated_at = ? WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)