修改退款

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/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();
     }
 

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);

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);