海外版售价0元不能提交

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/material/MaterialSalesController.java

@@ -180,31 +180,31 @@ public class MaterialSalesController {
         return ResponseHelper.success(configList);
     }
 
-    @PostMapping("/save/pay/order")
-    @ApiOperation(value = "生成订单支付并返回短链接")
-    public ResponseHelper<WebsitSalesPayMapBean> saveSheetPayMap(@RequestBody WebsitSalesPayMapBean sheetPayMap) throws RemoteServiceException {
-        return ResponseHelper.success(websitSalesLogic.saveSheetPayMap(sheetPayMap));
-    }
-
-    @ApiNotAuth
-    @PostMapping("/pay")
-    @ApiOperation(value = "生成支付")
-    public ResponseHelper<PayDetail> websitDefault(
-            @ApiParam(value = "appOrderId或payConfigId",required = true) @RequestParam String key,
-            @ApiParam(value = "openid",required = true) @RequestParam String openid,
-            @ApiParam(value = "salesId") @RequestParam(required = false) String salesId,
-            @ApiParam(value = "通联支付类型") @RequestParam(required = false, defaultValue = SybConstants.PAY_TYPE_W06) String payType,
-            @ApiParam(value = "支付完成跳转(必须为https协议地址，且不允许带参数)") @RequestParam(required = false) String frontUrl
-    ) throws RemoteServiceException, InterruptedException {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LOCK_ORDER + ":" + key);
-        if(!obtain.tryLock(10, TimeUnit.SECONDS)){
-            throw new RemoteServiceException("系统繁忙，请稍后再尝试");
-        }
-        try {
-            PayDetail pay = websitSalesLogic.generatePayRecord(key, openid, salesId, payType, frontUrl);
-            return ResponseHelper.success(pay);
-        }finally {
-            obtain.unlock();
-        }
-    }
+//    @PostMapping("/save/pay/order")
+//    @ApiOperation(value = "生成订单支付并返回短链接")
+//    public ResponseHelper<WebsitSalesPayMapBean> saveSheetPayMap(@RequestBody WebsitSalesPayMapBean sheetPayMap) throws RemoteServiceException {
+//        return ResponseHelper.success(websitSalesLogic.saveSheetPayMap(sheetPayMap));
+//    }
+//
+//    @ApiNotAuth
+//    @PostMapping("/pay")
+//    @ApiOperation(value = "生成支付")
+//    public ResponseHelper<PayDetail> websitDefault(
+//            @ApiParam(value = "appOrderId或payConfigId",required = true) @RequestParam String key,
+//            @ApiParam(value = "openid",required = true) @RequestParam String openid,
+//            @ApiParam(value = "salesId") @RequestParam(required = false) String salesId,
+//            @ApiParam(value = "通联支付类型") @RequestParam(required = false, defaultValue = SybConstants.PAY_TYPE_W06) String payType,
+//            @ApiParam(value = "支付完成跳转(必须为https协议地址，且不允许带参数)") @RequestParam(required = false) String frontUrl
+//    ) throws RemoteServiceException, InterruptedException {
+//        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LOCK_ORDER + ":" + key);
+//        if(!obtain.tryLock(10, TimeUnit.SECONDS)){
+//            throw new RemoteServiceException("系统繁忙，请稍后再尝试");
+//        }
+//        try {
+//            PayDetail pay = websitSalesLogic.generatePayRecord(key, openid, salesId, payType, frontUrl);
+//            return ResponseHelper.success(pay);
+//        }finally {
+//            obtain.unlock();
+//        }
+//    }
 }

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/material/WebsitSalesLogic.java

@@ -518,6 +518,10 @@ public class WebsitSalesLogic {
         sales.setSubmitBy(wechat.getUser().getNickName());
         sales.setSubmitTime(sales.getSalesTime());
 
+        if (sales.getTotalAmount().compareTo(BigDecimal.ZERO) <= 0) {
+            throw new RemoteServiceException("售价0元不能提交");
+        }
+
         websitSalesItemService.saveBatch(orderDetails);
 
         sales.insert();