提交bug

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinStoreOrderListSkuVo.java

@@ -13,6 +13,8 @@ public class GoblinStoreOrderListSkuVo implements Cloneable {
     private String orderSkuId;
     @ApiModelProperty(value = "skuId")
     private String skuId;
+    @ApiModelProperty(value = "spu名称")
+    private String spuName;
     @ApiModelProperty(value = "sku名称")
     private String skuName;
     @ApiModelProperty(value = "款式")

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

@@ -128,7 +128,7 @@ public class GoblinCouponImpl implements GoblinCouponService {
         List<GoblinUserCouponVo> voList = goblinRedisUtils.getUserCouponVos(uid);
         for (GoblinUserCouponVo vo : voList) {
             //判断券状态 和 触发金额
-            if (vo.getState().equals(1) && vo.getTriggers().compareTo(totalPrice) >= 0) {
+            if (vo.getState().equals(1) && vo.getTriggers().compareTo(totalPrice) <= 0) {
                 List<String> spuIds = goblinRedisUtils.getStoreCouponSpuIds(vo.getStoreCouponId());
                 //判断是否在可用商品内
                 for (String item : spuIds) {
@@ -138,8 +138,11 @@ public class GoblinCouponImpl implements GoblinCouponService {
                         if (vo.getType().equals("1")) {//代金券
                             tempPrice = vo.getValFace();
                         } else if (vo.getType().equals("2")) {//折扣
-                            tempPrice = totalPrice.multiply(vo.getDeduction()).setScale(2, BigDecimal.ROUND_HALF_UP);
-                        } else if (vo.getType().equals("3") && vo.getTriggers().compareTo(totalPrice) >= 0) {//满减
+                            tempPrice = totalPrice.multiply(vo.getDiscount()).setScale(2, BigDecimal.ROUND_HALF_UP);
+                            if (tempPrice.compareTo(vo.getDeduction()) > 0) {
+                                tempPrice = vo.getDeduction();
+                            }
+                        } else if (vo.getType().equals("3") && vo.getTriggers().compareTo(totalPrice) <= 0) {//满减
                             tempPrice = vo.getValMinus();
                         }
                         if (maxPrice.compareTo(tempPrice) < 0) {
@@ -183,7 +186,7 @@ public class GoblinCouponImpl implements GoblinCouponService {
         for (GoblinUserCouponVo vo : voList) {
             if (vo.getUcouponId().equals(ucouponId)) {
                 //判断券状态 和 触发金额
-                if (vo.getState().equals(1) && vo.getTriggers().compareTo(totalPrice) >= 0) {
+                if (vo.getState().equals(1) && vo.getTriggers().compareTo(totalPrice) <= 0) {
                     List<String> spuIds = goblinRedisUtils.getStoreCouponSpuIds(vo.getStoreCouponId());
                     //判断是否在可用商品内
                     for (String item : spuIds) {
@@ -193,9 +196,13 @@ public class GoblinCouponImpl implements GoblinCouponService {
                                 returnVo.setValue(vo.getValFace());
                                 returnVo.setCouType(vo.getType());
                             } else if (vo.getType().equals("2")) {//折扣
-                                returnVo.setValue(totalPrice.multiply(vo.getDeduction()).setScale(2, BigDecimal.ROUND_HALF_UP));
+                                BigDecimal tempPrice = totalPrice.multiply(vo.getDiscount()).setScale(2, BigDecimal.ROUND_HALF_UP);
+                                if (tempPrice.compareTo(vo.getDeduction()) > 0) {
+                                    tempPrice = vo.getDeduction();
+                                }
+                                returnVo.setValue(tempPrice);
                                 returnVo.setCouType(vo.getType());
-                            } else if (vo.getType().equals("3") && vo.getTriggers().compareTo(totalPrice) >= 0) {//满减
+                            } else if (vo.getType().equals("3") && vo.getTriggers().compareTo(totalPrice) <= 0) {//满减
                                 returnVo.setValue(vo.getValMinus());
                                 returnVo.setCouType(vo.getType());
                             }

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

@@ -85,6 +85,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
                 itemSkuVo.setOrderSkuId(orderSkuVo.getOrderSkuId());
                 itemSkuVo.setSkuId(orderSkuVo.getSkuId());
                 itemSkuVo.setSkuName(orderSkuVo.getSkuName());
+                itemSkuVo.setSpuName(orderSkuVo.getSpuName());
                 itemSkuVo.setSkuPriceActual(orderSkuVo.getSkuPriceActual());
                 itemSkuVo.setSkuSpecs(orderSkuVo.getSkuSpecs());
                 itemSkuVo.setSkuImage(orderSkuVo.getSkuImage());