提交券

liquidnet-bus-config/liquidnet-config/liquidnet-service-goblin-dev.yml

@@ -16,7 +16,7 @@ liquidnet:
     pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
     level: debug
   mysql:
-    database-name: dev_ln_scene
+    database-name: test_ln_scene
   mongodb:
     sslEnabled: false
-    database: dev_ln_scene
+    database: test_ln_scene
\ No newline at end of file

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

@@ -292,9 +292,9 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             for (GoblinOrderSkuParam item : storeParam.getGoblinOrderSkuParamArrayList()) {
                 String pre = GoblinStatusConst.MarketPreStatus.getPre(item.getSpuId());
                 if (pre != null) {
-                    spuIds = spuIds.concat(item.getSpuId().split(pre)[0]+",");
+                    spuIds = spuIds.concat(item.getSpuId().split(pre)[0] + ",");
                 } else {
-                    spuIds = spuIds.concat(item.getSpuId()+",");
+                    spuIds = spuIds.concat(item.getSpuId() + ",");
                 }
             }
             if (tempCouponVo != null) {
@@ -305,7 +305,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                     }
                 }
             } else {
-                HashMap<String, Object> hashMap = orderUtils.useCoupon(platVoucherCode, "购买商品[" + orderCode + "]", storeTotalPrice, spuIds,uid);
+                HashMap<String, Object> hashMap = orderUtils.useCoupon(platVoucherCode, "购买商品[" + orderCode + "]", storeTotalPrice, spuIds, uid);
                 voucherPrice = (BigDecimal) hashMap.get("voucher");
                 Integer typeVoucher = (Integer) hashMap.get("type");
                 if (typeVoucher.equals(-1)) {
@@ -322,9 +322,9 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             for (GoblinOrderSkuParam item : storeParam.getGoblinOrderSkuParamArrayList()) {
                 String pre = GoblinStatusConst.MarketPreStatus.getPre(item.getSpuId());
                 if (pre != null) {
-                    spuIds = spuIds.concat( item.getSpuId().split(pre)[0]+",");
+                    spuIds = spuIds.concat(item.getSpuId().split(pre)[0] + ",");
                 } else {
-                    spuIds = spuIds.concat( item.getSpuId()+",");
+                    spuIds = spuIds.concat(item.getSpuId() + ",");
                 }
             }
             GoblinUseResultVo storeCouponVo = goblinCouponService.useCoupon(storeVoucherCode, "购买商品[" + orderCode + "]", storeTotalPrice, spuIds, uid);
@@ -857,6 +857,18 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             orderVo.setPriceRefund(orderVo.getPriceRefund().add(price));
             if (orderVo.getPriceRefund().compareTo(orderVo.getPriceActual()) >= 0) {
                 orderVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_6.getValue());
+                if (!(orderVo.getUcouponId() == null || orderVo.getUcouponId().equals(""))) {
+                    orderUtils.backCoupon(orderVo.getUcouponId(), orderVo.getUserId());
+                }
+
+                if (!(orderVo.getStoreCouponId() == null || orderVo.getStoreCouponId().equals(""))) {
+                    List<BackCouponParam> params = ObjectUtil.getBackCouponParam();
+                    BackCouponParam backCouponParam = BackCouponParam.getNew();
+                    backCouponParam.setuCouponIds(orderVo.getStoreCouponId());
+                    backCouponParam.setUid(orderVo.getUserId());
+                    params.add(backCouponParam);
+                    goblinCouponService.backCoupon(params);
+                }
             }
             backOrderVo.setStatus(GoblinStatusConst.Status.ORDER_BACK_STATUS_2.getValue());
             backOrderVo.setRefundAt(nowStr);
@@ -913,9 +925,9 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                     SqlMapping.gets(sqls, sqlsOrder, sqlsOrderSku, sqlsBackOrder));
         } else if (0 == status) {
 
-        }
-        return "success";
     }
+        return"success";
+}
 
     @Override
     public ResponseDto<List<GoblinMailVo>> getMail(String orderId, String mailId) {