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

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

@@ -437,6 +437,7 @@ public class WebsitSalesLogic {
 //        }
 
         sales.setTotalAmount(BigDecimal.ZERO);
+        sales.setPayType(PayTypeEnum.CASH.getKey());
 
         //订单详情
         List<WebsitSalesItem> orderDetails = new ArrayList<>();
@@ -466,7 +467,7 @@ public class WebsitSalesLogic {
             detail.setGoodsSalesUnit(bean.getGoodsSalesUnit());
             detail.setGoodsStockUnit(bean.getGoodsStockUnit());
             detail.setGoodsSpecification(bean.getGoodsSpecification());
-            detail.setPayType(detail.getPayType());
+            detail.setPayType(sales.getPayType());
             detail.setParentCategoryId(bean.getParentCategoryId());
             detail.setParentCategoryName(bean.getParentCategoryName());
             detail.setGoodsCategoryId(bean.getGoodsCategoryId());
@@ -518,6 +519,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();

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

@@ -234,8 +234,8 @@ public class WebsitPartsSalesOrderLogic {
         DateTime curDate = DateUtil.date();
 
         if (Objects.isNull(partsSalesOrderBean.getPayType())) {
-            // 默认通联
-            partsSalesOrderBean.setPayType(PayTypeEnum.ALLINPAY.getKey());
+            // 默认现金
+            partsSalesOrderBean.setPayType(PayTypeEnum.CASH.getKey());
         }
         List<PartsSalesOrderItemBean> itemList = partsSalesOrderBean.getItemList();
         BigDecimal totalPrice = BigDecimal.ZERO;

mall-server-api/src/main/java/com/gree/mall/manager/controller/workerorder/OrderBaseController.java

@@ -163,13 +163,13 @@ public class OrderBaseController {
 
     @PostMapping("/reject")
     @ApiOperation(value = "驳回工单")
-    public ResponseHelper reject(@RequestParam String orderBaseId,@RequestParam String createWebsitId,@RequestParam String createWebsitName) throws InterruptedException {
+    public ResponseHelper reject(@RequestParam String orderBaseId) throws InterruptedException {
         Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LOCK_ORDER + orderBaseId);
         if(!obtain.tryLock(10,TimeUnit.SECONDS)){
             throw new RemoteServiceException("系统繁忙,请稍后再试");
         }
         try{
-            orderBaseLogic.reject(orderBaseId,createWebsitId,createWebsitName);
+            orderBaseLogic.reject(orderBaseId);
         }finally {
             obtain.unlock();
         }

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseLogic.java

@@ -1,6 +1,7 @@
 package com.gree.mall.manager.logic.workorder;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -889,7 +890,7 @@ public class OrderBaseLogic {
      * @param orderBaseId
      */
     @Transactional
-    public void reject(String orderBaseId, String createWebsitId, String createWebsitName) {
+    public void reject(String orderBaseId) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         PgOrderBase pgOrderBase = pgOrderBaseService.getById(orderBaseId);
         if (pgOrderBase == null) {
@@ -905,7 +906,14 @@ public class OrderBaseLogic {
         pgOrderBase.setOrderStatus(OrderBaseStatusEnum.FWZ.getKey());
         pgOrderBase.setOrderStatusText(OrderBaseStatusEnum.FWZ.getRemark());
         pgOrderBase.updateById();
-        orderLogLogic.addLog(orderBaseId, "未完工驳回", adminUser.getNickName() + "于" + DateUtil.formatDateTime(new Date()) + "驳回工单到服务中", createWebsitName);
+
+        String optWebsitName = "";
+        if (CollectionUtil.isNotEmpty(adminUser.getAdminWebsitIds())) {
+            final AdminWebsit websit = adminWebsitService.getById(adminUser.getAdminWebsitIds().get(0));
+            optWebsitName = websit.getName();
+        }
+
+        orderLogLogic.addLog(orderBaseId, "未完工驳回", adminUser.getNickName() + "于" + DateUtil.formatDateTime(new Date()) + "驳回工单到服务中", optWebsitName);
         //删除标记
         orderFlagLogic.deleteOrderFlag(orderBaseId, OrderFlagEnum.YWG);
         //删除产生的结算数据