Merge remote-tracking branch 'origin/qa' into qa

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java

@@ -242,6 +242,7 @@ public class ShoppingCartMCoffeeServiceImpl {
                 } else {
                     B3S1CouponGoodsInfoVo b3S1CouponGoodsInfoVo = new B3S1CouponGoodsInfoVo();
                     addCartGoods.setB3S1CouponGoodsInfo(b3S1CouponGoodsInfoVo);
+                    addCartGoods.setQty(1);
                     Set<String> set = new HashSet<>();
                     b3S1CouponGoodsInfoVo.setCardCodeSet(set);
                     set.add(addShoppingCartGoodsRequestVo.getCouponCode());
@@ -267,6 +268,7 @@ public class ShoppingCartMCoffeeServiceImpl {
                     } else {
                         CartGoods cartGoods9998 = new CartGoods();
                         cartGoods9998.setSkuId("9998");
+                        cartGoods9998.setQty(1);
                         B3S1CouponGoodsInfoVo b3S1CouponGoodsInfoVo = new B3S1CouponGoodsInfoVo();
                         cartGoods9998.setB3S1CouponGoodsInfo(b3S1CouponGoodsInfoVo);
                         Set<String> set = new HashSet<>();

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java

@@ -15,6 +15,7 @@ import cn.freemud.service.impl.mcoffee.entity.*;
 import cn.freemud.service.thirdparty.CouponClient;
 import cn.freemud.service.thirdparty.CustomerExtendClient;
 import cn.freemud.utils.BarcodeUtil;
+import cn.freemud.utils.ExceptionUtils;
 import cn.freemud.utils.LogUtil;
 import com.alibaba.fastjson.JSON;
 import com.freemud.application.sdk.api.log.ApiLog;
@@ -45,6 +46,7 @@ import java.util.stream.Collectors;
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
 @Service
+@Slf4j
 public class CouponDiscountCalculation {
 
     @Autowired
@@ -205,14 +207,19 @@ public class CouponDiscountCalculation {
                     cartGoods.setQty(b3S1DiscountOptional.get().getActualGoodsNumber());
                     cartGoods.setCouponName(b3S1DiscountOptional.get().getActivityName());
                     cartGoods.setCouponCode(b3S1DiscountOptional.get().getActivityCode());
-                    cartGoods.setIsB3S1Coupon(1);
+                    cartGoods.setIsB3S1CouponGoods(1);
                     CartGoods cartGoodsNew = new CartGoods();
                     BeanUtils.copyProperties(cartGoods, cartGoodsNew);
                     cartGoodsNew.setCartGoodsUid(UUID.randomUUID().toString());
                     cartGoodsNew.setQty(newNum);
                     cartGoodsNew.setAmount(cartGoods.getAmount());
-                    cartGoods.setAmount(0l);
+                    cartGoods.setAmount(goodsMap.get(cartGoods.getCartGoodsUid()).getRealAmount());
                     newCartGoodsList.add(cartGoodsNew);
+                } else if(cartGoods.getQty() == b3S1DiscountOptional.get().getActualGoodsNumber()) {
+                    cartGoods.setCouponName(b3S1DiscountOptional.get().getActivityName());
+                    cartGoods.setCouponCode(b3S1DiscountOptional.get().getActivityCode());
+                    cartGoods.setIsB3S1CouponGoods(1);
+                    cartGoods.setAmount(goodsMap.get(cartGoods.getCartGoodsUid()).getRealAmount());
                 }
             }
         }
@@ -539,7 +546,9 @@ public class CouponDiscountCalculation {
         try {
             for (CartGoods cartGood : cartGoods) {
                 // 剔除商品券得商品
-                if (StringUtils.isEmpty(cartGood.getSkuId()) && StringUtils.isEmpty(cartGood.getSpuId()) || StringUtils.equals("9999",cartGood.getSkuId())) {
+                if (StringUtils.isEmpty(cartGood.getSkuId()) && StringUtils.isEmpty(cartGood.getSpuId())
+                        || StringUtils.equals("9999",cartGood.getSkuId())
+                        || StringUtils.equals("9998",cartGood.getSkuId())) {
                     continue;
                 }
                 // 剔除商品券得商品,麦咖啡逻辑
@@ -565,6 +574,7 @@ public class CouponDiscountCalculation {
                 totalAmount = totalAmount +product.getAmount() * cartGood.getQty();
             }
         } catch (NumberFormatException e) {
+            log.error("数字转换异常:" + ExceptionUtils.getExceptionInfo(e));
             throw new ServiceException(ResponseResult.SYSTEM_ERROR);
         }
         return totalAmount;

shopping-cart-application-service/src/test/java/cn.freemud/service/ShoppingCartMCoffeeServiceTest.java

@@ -58,4 +58,9 @@ public class ShoppingCartMCoffeeServiceTest {
         shoppingCartMCoffeeService.updateGoodsQty(JSON.parseObject("{\"appId\":\"wx6816a0b007741702\",\"cartGoodsUid\":\"c9fd8e50-8dc9-48e2-a36e-bd6313ef81e9\",\"channelType\":\"saas\",\"menuType\":\"saas\",\"orderType\":1,\"partnerId\":\"1206\",\"qty\":2,\"receiveId\":\"\",\"sessionId\":\"f3e238f5b30270ce4353695fe619fd6ddf9ce9ad\",\"shopId\":\"1450026\"}", UpdateShoppingCartGoodsQtyRequestVo.class));
     }
 
+    @Test
+    public void f3() {
+        shoppingCartMCoffeeService.getGoodsList(JSON.parseObject("{\"appId\":\"wx6816a0b007741702\",\"buyType\":0,\"channelType\":\"saas\",\"couponCode\":\"\",\"isUseMonthCard\":1,\"menuType\":\"saas\",\"orderType\":1,\"partnerId\":\"1206\",\"receiveId\":\"\",\"sessionId\":\"b336cc00111c142d437236bfa69a688dfbc112c0\",\"shopId\":\"1450026\"}", ShoppingCartInfoRequestVo.class));
+    }
+
 }