Merge remote-tracking branch 'origin/developer' into developerH

src/main/java/com/caimei365/order/constant/Constant.java

@@ -42,7 +42,8 @@ public class Constant {
     public static final String FENZHANG="2hATS0A4IoxdudGxNkGRNOt6aFSdOd8Q";
     //公共产品
     public static final String GONG="wrED4jYgKLQVsEwtgZ2eQmXrRgo7VHy4";
-
+    //结算
+    public static final String JIESUAN="fiweQU8igfuhBTcXLLDAQ3DScwIPEy2s";
     /**
      * 扫码接口地址
      */

src/main/java/com/caimei365/order/mapper/OrderCommonMapper.java

@@ -171,5 +171,7 @@ public interface OrderCommonMapper {
     Double findEachDiscount(Integer shopOrderId);
 
     String findWeChatFlag(String splitCode,Integer shopId);
+
+    Integer findPayB2BRecord(Integer shopOrderId);
 }
 

src/main/java/com/caimei365/order/service/impl/PayOrderServiceImpl.java

@@ -660,9 +660,9 @@ public class PayOrderServiceImpl implements PayOrderService {
         // 订单信息
         ShopOrderVo shop = orderCommonMapper.getShopOrderByOrderId(shopOrderId);
         String weChatFlag = "0";
-        if(StringUtils.isNotBlank(shop.getSplitCode())){
-            weChatFlag = orderCommonMapper.findWeChatFlag(shop.getSplitCode(),shop.getShopId());
-        }else{
+        if (StringUtils.isNotBlank(shop.getSplitCode())) {
+            weChatFlag = orderCommonMapper.findWeChatFlag(shop.getSplitCode(), shop.getShopId());
+        } else {
             weChatFlag = "2";
         }
         OrderVo order = orderCommonMapper.getOrderByOrderId(shop.getOrderId());
@@ -740,7 +740,14 @@ public class PayOrderServiceImpl implements PayOrderService {
             onlinePay = 1;
         }
         // 返回数据
+        // 佣金<50不允许走企业网银，企业网银最多支付5次;0不能企业网银，1可以
+        int B2BpayFlag = 0;
+        Integer payNum = orderCommonMapper.findPayB2BRecord(shopOrderId);
+        if (null != shop.getBrokerage() && shop.getBrokerage() > 50 && payNum <= 5) {
+            B2BpayFlag = 1;
+        }
         Map<String, Object> map = new HashMap<>();
+        map.put("B2BpayFlag", B2BpayFlag);
         map.put("userName", userName);
         map.put("shopOrder", shop);
         map.put("discernReceipt", discernReceiptList);
@@ -1105,7 +1112,7 @@ public class PayOrderServiceImpl implements PayOrderService {
             log.info("【支付异步回调】>>>>>更新用户采美豆(update[user(userBeans:" + userBeans + ")])，userId:" + beansHistory.getUserId());
         }
         // 已支付短信推送(取消推送)
-        if(orderClubMapper.getProductOrder(orderId).contains(6060)) {
+        if (orderClubMapper.getProductOrder(orderId).contains(6060)) {
             boolean smsPushFlag = !orderRequestNo.contains("BETA") && !orderRequestNo.contains("DEV");
             String bindMobile = baseMapper.getBindMobileByUserId(order.getUserId());
             if (smsPushFlag && StringUtils.isNotBlank(bindMobile)) {

src/main/java/com/caimei365/order/service/impl/SubmitServiceImpl.java

@@ -1556,7 +1556,6 @@ public class SubmitServiceImpl implements SubmitService {
             cartClubMapper.deleteCartByProductIds(orderParamBo.getUserId(), productIdList);
             log.info("【提交订单】>>>>删除当前机构 用户 购物车数据！");
         }
-int Id=0;
         log.info("**********************微信模板消息推送*****************************");
         List<Integer> productIds = orderClubMapper.getProductOrder(mainOrder.getOrderId());
         if (0 == mainOrder.getSecondHandOrderFlag() && 0 == mainOrder.getRebateFlag() && (null != productIds && !productIds.contains(6060)) && mainOrder.getOrderType()!=0) {
@@ -1588,7 +1587,6 @@ int Id=0;
                     log.error("获取openid>>>>>" + openidList);
                     weChatService.sendTemplateMsgs(accessToken, openid, associateTitle, name, orderno, money, remarkText, pagePath);
                 }
-                Id=1;
             } catch (Exception e) {
                 log.error("【订单下单通知】获取微信公众号access_token异常！", e);
             }

src/main/resources/mapper/OrderCommonMapper.xml

@@ -720,4 +720,10 @@
         WHERE commercialCode = #{splitCode}
         and shopId = #{shopId}
     </select>
+    <select id="findPayB2BRecord" resultType="java.lang.Integer">
+        SELECT COUNT(*) FROM cm_receipt_order_relation cror
+        LEFT JOIN cm_discern_receipt cdr ON cror.receiptID=cdr.id
+        WHERE cdr.payway=1 AND cdr.payType=12
+        AND cror.shopOrderId = #{shopOrderId}
+    </select>
 </mapper>