Merge remote-tracking branch 'origin/master'

lb-app/src/main/java/com/ydd/app/controller/StoreApi.java

@@ -72,7 +72,9 @@ public class StoreApi extends BaseController {
     @RequestMapping(value = "/delivery/status", method = RequestMethod.POST)
     @AccessToken
     public ResponseResult changeShopDelivery(@RequestBody @Validated({Update.class}) StoreStatusDto dto) {
-
+        if(dto.getStatus()>1||dto.getStatus()<0){
+            return ResponseResult.error(ResponseResultCodeEnum.FIELD_INVALID);
+        }
         ResponseResult resp = apiStoreService.changeShopDelivery(getLoginId(), dto);
         return resp;
     }

lb-app/src/main/java/com/ydd/app/dto/StoreStatusDto.java

@@ -32,8 +32,6 @@ public class StoreStatusDto extends BaseDto implements Serializable {
     @NotBlank(message = "参数deliveryIdStr不能为空",groups = Update.class)
     private String deliveryIdStr;
 
-    @Max(value = 1,message = "参数status无效")
-    @Min(value = 0,message = "参数status无效")
     @NotNull(message = "参数status不能为空",groups = Update.class)
     private Integer status;
 

lb-app/src/main/java/com/ydd/app/service/impl/ApiOrderNewServiceImpl.java

@@ -403,7 +403,9 @@ public class ApiOrderNewServiceImpl implements ApiOrderNewService {
         } else {
             iOrderService.save(order);
         }
-        redisCache.setCacheObject(couponDto.getId()+"","",2,TimeUnit.MINUTES);
+        if (!Objects.isNull(couponDto)) {
+            redisCache.setCacheObject(couponDto.getId() + "","",2,TimeUnit.MINUTES);
+        }
         // 达达收付配送商计价明细入库
         if (isDadaRapDelivery) {
             OrderFreight orderFreight = new OrderFreight();
@@ -428,7 +430,9 @@ public class ApiOrderNewServiceImpl implements ApiOrderNewService {
         if (PaymentTypeEnum.BALANCE.type.equals(req.getPaymentType()) || payAmount.compareTo(BigDecimal.ZERO) == 0) {
             //更改优惠券状态
             apiCouponService.updateCoupon(couponDto);
-            redisCache.deleteObject(couponDto.getId()+"");
+            if (!Objects.isNull(couponDto)) {
+                redisCache.deleteObject(couponDto.getId()+"");
+            }
             // 发单
             if (CollectionUtils.isNotEmpty(resList)) {
                 //   order.setProduct(product);