|
@@ -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,8 +740,14 @@ public class PayOrderServiceImpl implements PayOrderService {
|
|
|
onlinePay = 1;
|
|
|
}
|
|
|
// 返回数据
|
|
|
- // todo 佣金<50不允许走企业网银,企业网银最多支付5次
|
|
|
+ // 佣金<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);
|
|
@@ -1106,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)) {
|