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

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

@@ -187,7 +187,7 @@ public class MaterialSalesController {
     }
 
     @ApiNotAuth
-    @GetMapping("/pay")
+    @PostMapping("/pay")
     @ApiOperation(value = "生成支付")
     public ResponseHelper<PayDetail> websitDefault(
             @ApiParam(value = "appOrderId或payConfigId",required = true) @RequestParam String key,
@@ -206,6 +206,5 @@ public class MaterialSalesController {
         }finally {
             obtain.unlock();
         }
-
     }
 }

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

@@ -325,16 +325,16 @@ public class WebsitSalesLogic {
         WebsitSales sales = new WebsitSales();
 
         // 检查是否有支付配置
-        final Integer payConfigCount = adminWebsitPayConfigService.lambdaQuery()
-                .eq(AdminWebsitPayConfig::getCompanyWechatId, wechat.getCompanyWechatId())
-                .eq(AdminWebsitPayConfig::getWebsitId, websitId)
-                .eq(AdminWebsitPayConfig::getType, goodsType)
-                .eq(AdminWebsitPayConfig::getStatus, true)
-                .count();
-
-        if (payConfigCount == 0) {
-            throw new RemoteServiceException("未配置线上收款");
-        }
+//        final Integer payConfigCount = adminWebsitPayConfigService.lambdaQuery()
+//                .eq(AdminWebsitPayConfig::getCompanyWechatId, wechat.getCompanyWechatId())
+//                .eq(AdminWebsitPayConfig::getWebsitId, websitId)
+//                .eq(AdminWebsitPayConfig::getType, goodsType)
+//                .eq(AdminWebsitPayConfig::getStatus, true)
+//                .count();
+//
+//        if (payConfigCount == 0) {
+//            throw new RemoteServiceException("未配置线上收款");
+//        }
 
         sales.setTotalAmount(BigDecimal.ZERO);
 
@@ -390,7 +390,8 @@ public class WebsitSalesLogic {
         sales.setWorkerMobile(wechat.getUser().getMobile());
         sales.setSalesTime(DateUtil.date());
         sales.setOrderSource("ONLINE");
-        sales.setFlag("SUBMIT");
+//        sales.setFlag("SUBMIT");
+        sales.setFlag("SAVE");
         sales.setRemark(remark);
         sales.setCreateBy(wechat.getUser().getNickName());
         sales.setCreateTime(sales.getSalesTime());