修改 订单用券逻辑

1.跨店铺不可用平台券
2.店铺券+平台券不可一起使用

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

@@ -194,7 +194,11 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                 return ResponseDto.failure(ErrorMapping.get("20018"));//乱七八糟异常
             } else if (e.getMessage().equals("无权购买")) {
                 return ResponseDto.failure(e.getMessage());
-            } else if (e.getMessage().equals("平台券不可用")) {
+            } else if (e.getMessage().equals("平台券店铺券不可一起使用")) {
+                return ResponseDto.failure(e.getMessage());
+            }else if (e.getMessage().equals("平台券店铺券不可一起使用")) {
+                return ResponseDto.failure(e.getMessage());
+            } else if (e.getMessage().equals("跨店铺购物平台券不可用")) {
                 return ResponseDto.failure(e.getMessage());
             } else if (e.getMessage().equals("店铺券不可用")) {
                 return ResponseDto.failure(e.getMessage());
@@ -284,6 +288,16 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             orderSku.setSpuPic(spuVo.getCoverPic());
             goblinOrderSkuList.add(orderSku);
         }
+
+
+        if ((platVoucherCode != null && !platVoucherCode.equals("")) && (storeVoucherCode != null && !storeVoucherCode.equals(""))) {
+            throw new Exception("平台券店铺券不可一起使用");
+        }
+
+        if(param.getGoblinOrderStoreParamList().size()>1 && (platVoucherCode != null && !platVoucherCode.equals(""))){
+            throw new Exception("跨店铺购物平台券不可用");
+        }
+
         //优惠券
         BigDecimal voucherPrice = BigDecimal.ZERO;
         if (platVoucherCode != null && !platVoucherCode.equals("")) {
@@ -358,7 +372,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
         storeOrder.setPriceRefund(BigDecimal.ZERO);
         storeOrder.setPriceCoupon(voucherPrice);
         storeOrder.setStorePriceCoupon(storeVoucherPrice);
-        storeOrder.setPriceVoucher(voucherPrice.add(storeVoucherPrice).add(voucherMarket));
+        storeOrder.setPriceVoucher(voucherPrice.add(storeVoucherPrice));
         storeOrder.setStatus(0);
         storeOrder.setUcouponId(platVoucherCode);
         storeOrder.setStoreCouponId(storeVoucherCode);
@@ -747,7 +761,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
                 redisUtils.setGoblinOrder(orderId, orderVo);
                 redisUtils.setOffCode(orderVo.getWriteOffCode(), orderVo.getMasterOrderCode());
                 //删除未支付订单
-                redisUtils.removeGoblinOrder(orderVo.getRandomKey()+"", orderId);
+                redisUtils.removeGoblinOrder(orderVo.getRandomKey() + "", orderId);
                 //mongo
                 mongoUtils.updateGoblinStoreOrderVo(orderId, orderVo);
                 //mysql
@@ -929,9 +943,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) {

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

@@ -95,6 +95,7 @@ public class GoblinStoreBackOrderServiceImpl implements IGoblinStoreBackOrderSer
         List<GoblinOrderSkuVo> orderSkuVoList = ObjectUtil.getGoblinOrderSkuVoArrayList();
         for (String orderSkuVoId : orderVo.getOrderSkuVoIds()) {
             GoblinOrderSkuVo orderSkuVo = redisUtils.getGoblinOrderSkuVo(orderSkuVoId);
+            orderSkuVo.setStatus(vo.getStatus());
             orderSkuVoList.add(orderSkuVo);
         }
         vo.setOrderSkuVoList(orderSkuVoList);