Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!480

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserDeliverOrderController.java

@@ -231,7 +231,7 @@ public class UserDeliverOrderController extends BaseApiController {
       jsonObject.put("needPay", 0);
     }
     // 清除缓存的订单
-    redisCache.deleteObject(RedisKey.build(RedisKey.USER_TICKET_ORDER_KEY, userId));
+    redisCache.deleteObject(RedisKey.build(RedisKey.USER_DELIVER_ORDER_KEY, userId));
 
     return AjaxResult.success(jsonObject);
   }

mp-service/src/main/java/com/qs/mp/common/service/impl/ShippingTemplateServiceImpl.java

@@ -53,25 +53,14 @@ public class ShippingTemplateServiceImpl extends ServiceImpl<ShippingTemplateMap
     @Override
     public int calculateFreightAmt(Integer num, ShippingTemplateCalculateVO shippingTemplateCalculateVO) {
         int freightAmt = shippingTemplateCalculateVO.getDefaultPrice();
-        if (num - shippingTemplateCalculateVO.getDefaultNumber() > 0) {
+        int createNumber = shippingTemplateCalculateVO.getCreateNumber();
+        if (num - shippingTemplateCalculateVO.getDefaultNumber() > 0 && createNumber > 0) {
             // 运费:首件价格 + ((商品数量 - 首件数量) / 续件数量)向上取整 * 续件价格
-            int createNumber = shippingTemplateCalculateVO.getCreateNumber();
             freightAmt += ((int) Math.ceil(NumberUtil.div(num - shippingTemplateCalculateVO.getDefaultNumber(), createNumber))) * shippingTemplateCalculateVO.getCreatePrice();
         }
         return freightAmt;
     }
 
-    public static void main(String[] args) {
-        Integer num = 2;
-        Integer defaultNumber = 1;
-        Integer defaultMoney = 2;
-        int createNumber = 2;
-        Integer createMoney = 5;
-        int freightAmt = defaultMoney;
-        freightAmt += ((int) Math.ceil(NumberUtil.div(num - defaultNumber, createNumber))) * createMoney;
-        System.out.println("freightAmt = " + freightAmt);
-    }
-
 
     @Override
     @Transactional(rollbackFor = Exception.class)

mp-service/src/main/java/com/qs/mp/user/service/impl/UserDeliverOrderServiceImpl.java

@@ -96,9 +96,12 @@ public class UserDeliverOrderServiceImpl extends ServiceImpl<UserDeliverOrderMap
       orderItem.setPicUrl(prizeStorage.getPicUrl());
       orderItem.setGoodsNum(prizeStorage.getGoodsNum());
       userDeliverOrderItemService.save(orderItem);
-      userPrizeStorageService.update(new LambdaUpdateWrapper<UserPrizeStorage>()
-          .set(UserPrizeStorage::getStatus, PrizeStorageStatusEnum.HAS_DISTRIBUTED)
-          .eq(UserPrizeStorage::getStorageId, prizeStorage.getStorageId()));
+      boolean rtn = userPrizeStorageService.update(new LambdaUpdateWrapper<UserPrizeStorage>()
+                .set(UserPrizeStorage::getStatus, PrizeStorageStatusEnum.HAS_DISTRIBUTED)
+                .eq(UserPrizeStorage::getStorageId, prizeStorage.getStorageId()));
+
+        Assert.isTrue(rtn, "提交提货订单时，更新状态失败。userDeliverOrder:" + JSONObject.toJSONString(userDeliverOrder));
+
     }
 
     return userDeliverOrder.getOrderId();