bugfix

src/main/java/com/caimei/modules/groupbuy/service/ProcureService.java

@@ -206,7 +206,9 @@ public class ProcureService {
                 query.addCriteria(Criteria.where("isAchieve").is(dto.getStatus().toString()));
             }
         }
-
+        if (StringUtils.isNotBlank(dto.getLinkMan())) {
+            query.addCriteria(Criteria.where("clubName").regex(".*" + dto.getLinkMan() + ".*"));
+        }
         if (StringUtils.isNotBlank(dto.getStartSaveTime()) && StringUtils.isNotBlank(dto.getEndSaveTime())) {
             /**
              * 传入结束时间为当日0点，加一天改为当日结束时间

src/main/java/com/caimei/modules/homepage/service/impl/PageServiceImpl.java

@@ -163,6 +163,11 @@ public class PageServiceImpl implements PageService {
 
     @Override
     public ResponseJson checkThemeStatus(Integer id) {
+        Theme theme = themeDao.selectById(id);
+        // 0停用 1启用
+        if (0 == theme.getEnabledStatus()) {
+            themeDao.closeAll();
+        }
         themeDao.checkStatus(id);
         return ResponseJson.success("成功!");
     }

src/main/java/com/caimei/modules/order/service/impl/PayShopServiceImpl.java

@@ -60,6 +60,12 @@ public class PayShopServiceImpl implements PayShopService {
         OrderPayShopDetail detail = payShopDao.findPayShopDetail(id);
         List<NewShopOrder> shopOrders = payShopDao.findPayShopOrders(detail.getPayShopId());
         shopOrders.forEach(s -> orderUtils.getShouldPay(s));
+        Double totalPayShop = shopOrders.stream().mapToDouble(NewShopOrder::getPayedShopAmount).sum();
+        // 付供应商
+        detail.setTotalAmount(totalPayShop);
+        Double totalPayCm = shopOrders.stream().mapToDouble(NewShopOrder::getPayCmAmount).sum();
+        // 付采美
+        detail.setPayCmTotalAmount(totalPayCm);
         detail.setShopOrders(shopOrders);
         return detail;
     }
@@ -217,6 +223,7 @@ public class PayShopServiceImpl implements PayShopService {
                     PayParamBo payParam = new PayParamBo();
                     //支付金额
                     payParam.setAllPay(orderRelation.getAssociateAmount());
+                    payParam.setPayType(orderRelation.getPayType().toString());
                     List<SplitAccountPo> splitBillDetail = new ArrayList<>();
                     /**
                      *  todo
@@ -477,6 +484,29 @@ public class PayShopServiceImpl implements PayShopService {
             BigDecimal total = MathUtil.mul(orderProduct.getPrice(), orderProduct.getNum());
             // 总价 * 供应商百分比 = 成本分账金额
             double costPrice = MathUtil.mul(total, MathUtil.div(orderProduct.getShopPercent(), 100)).doubleValue();
+            // 供应商承担手续费 ，减去手续费
+            String payType = payParam.getPayType();
+            double charge = 0d;
+            if ("17".equals(payType)) {
+                // 17 个人网银 0.2% 最低0.1
+                charge = Math.max(MathUtil.mul(splitAmount, 0.002, 2).doubleValue(), 0.1);
+            } else if ("12".equals(payType)) {
+                // 企业网银单笔10元
+                charge = 10;
+            } else if ("13".equals(payType) || "15".equals(payType)) {
+                // 13PC-微信支付 15 微信小程序支付 0.65% 最低0.01
+                charge = Math.max(MathUtil.mul(splitAmount, 0.0065, 2).doubleValue(), 0.01);
+            } else if ("14".equals(payType)) {
+                //  14PC-支付宝 0.25% 最低0.01
+                charge = Math.max(MathUtil.mul(splitAmount, 0.0025, 2).doubleValue(), 0.01);
+            } else if ("29".equals(payType)) {
+                // 29快捷支付借记卡  0.3% 最低0.1
+                charge = Math.max(MathUtil.mul(splitAmount, 0.003, 2).doubleValue(), 0.1);
+            } else if ("30".equals(payType)) {
+                //  30快捷支付贷记卡 0.6%  最低0.1
+                charge = Math.max(MathUtil.mul(splitAmount, 0.006, 2).doubleValue(), 0.1);
+            }
+            costPrice = costPrice - charge;
             totalCostPrice.set(MathUtil.add(costPrice, totalCostPrice.get()));
             double organize = MathUtil.mul(total, MathUtil.div(orderProduct.getOrganizePercent(), 100), 2).doubleValue();
             totalOrganize.set(MathUtil.add(organize, totalOrganize.get()));

src/main/java/com/caimei/modules/products/controller/CmMallOrganizeProductsController.java

@@ -89,11 +89,11 @@ public class CmMallOrganizeProductsController {
     @GetMapping(value = "/switchLine/{id}")
     public JsonModel switchLine(@PathVariable("id") Integer id) {
         CmMallOrganizeProducts organizeProducts = cmMallOrganizeProductsService.get(id);
-        if ("1".equals(organizeProducts.getValidFlag())) {
-            organizeProducts.setValidFlag("2");
+        if (1 == organizeProducts.getValidFlag()) {
+            organizeProducts.setValidFlag(2);
         } else {
             //上线商品
-            organizeProducts.setValidFlag("1");
+            organizeProducts.setValidFlag(1);
         }
         cmMallOrganizeProductsService.updateValidFlag(organizeProducts);
         return JsonModel.newInstance().success();

src/main/java/com/caimei/modules/products/entity/CmMallOrganizeProducts.java

@@ -23,7 +23,7 @@ public class CmMallOrganizeProducts implements Serializable {
     private String normalPrice;        // 市场价
     private String price;        // 售价
     private String minBuyNumber;        // 最小起订量
-    private String validFlag;        // 商品状态,1已上架,2已下架
+    private Integer validFlag;        // 商品状态,1已上架,2已下架
     private Date addTime;        // 添加时间
     /**
      * 规格

src/main/java/com/caimei/modules/products/service/impl/CmMallOrganizeProductsServiceImpl.java

@@ -54,6 +54,7 @@ public class CmMallOrganizeProductsServiceImpl implements CmMallOrganizeProducts
     public void updateProductInfo(CmMallOrganizeProducts cmMallOrganizeProducts) {
         List<Sku> skus = cmMallOrganizeProducts.getSkus();
         skus.forEach(s -> cmMallOrganizeProductsDao.updateSku(s));
+        cmMallOrganizeProducts.setId(skus.get(0).getProductId());
         cmMallOrganizeProductsDao.updateProductInfo(cmMallOrganizeProducts);
     }