Browse Source

Merge branch 'release_toaliyun_real_202211' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202211

release_toaliyun_real
xhxu 3 years ago
parent
commit
309b95f947
33 changed files with 713 additions and 201 deletions
  1. +3
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java
  2. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java
  3. +22
    -2
      mallinkAdmin/src/main/java/com/iformall/interceptor/CurrentTenantInterceptor.java
  4. +407
    -1
      mallinkAdmin/src/main/resources/db/migration/V2022111500001__plat_coupon.sql
  5. +1
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java
  6. +0
    -48
      mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java
  7. +1
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java
  8. +0
    -1
      mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java
  9. +15
    -9
      mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java
  10. +1
    -1
      mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java
  11. +1
    -1
      mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java
  12. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java
  13. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java
  14. +2
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingResult.java
  15. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java
  16. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideOrderPushMsg.java
  17. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java
  18. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxCashOutService.java
  19. +2
    -2
      mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java
  20. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxOrderService.java
  21. +3
    -2
      mallinkService/src/main/java/com/iformall/service/WxProfitSharingOrderService.java
  22. +3
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java
  23. +2
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxCashOutServiceImpl.java
  24. +173
    -91
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  25. +4
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  26. +8
    -7
      mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java
  27. +10
    -8
      mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java
  28. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java
  29. +2
    -1
      mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCouponVerifyMsgServiceImpl.java
  30. +6
    -1
      mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderPushDeliveryMsgServiceImpl.java
  31. +16
    -11
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml
  32. +7
    -1
      mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml
  33. +6
    -2
      mallinkService/src/main/resources/mapper/WxProfitSharingResultMapper.xml

+ 3
- 0
mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java View File

@@ -8,6 +8,7 @@ import java.util.Date;
import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.shiro.UserSession;
import com.iformall.utils.Constant;
import com.iformall.utils.IPUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
@@ -74,9 +75,11 @@ public class BaseController {
Session session = SecurityUtils.getSubject().getSession();
String tenantId = (String)session.getAttribute(UserSession.tenantId);
String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId);
boolean isChildMall = (boolean)session.getAttribute(Constant.IS_CHILD_MALL);
TenantEntity tenantEntity = new TenantEntity();
tenantEntity.setTenantId(tenantId);
tenantEntity.setParentTenantId(parentTenantId);
tenantEntity.setChildMall(isChildMall);
return tenantEntity;
}



+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java View File

@@ -2,11 +2,13 @@ package com.iformall.controller.market;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.annotation.TenantIgnore;
import com.iformall.common.ErrorCode;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxAppinfo;
import com.iformall.domain.po.WxCouponOrder;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.WxCouponOrderBVo;
import com.iformall.enums.EnumAppType;
import com.iformall.enums.EnumPayType;


+ 22
- 2
mallinkAdmin/src/main/java/com/iformall/interceptor/CurrentTenantInterceptor.java View File

@@ -2,12 +2,15 @@ package com.iformall.interceptor;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
import com.iformall.annotation.TenantIgnore;
import com.iformall.common.TenantThreadLocal;
import com.iformall.shiro.UserSession;
import com.iformall.utils.Constant;

/**
* 权限(Token)验证
@@ -21,8 +24,25 @@ public class CurrentTenantInterceptor extends HandlerInterceptorAdapter {
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
TenantThreadLocal.setCurrentThreadTenant((String)request.getSession().getAttribute(UserSession.tenantId),
(String)request.getSession().getAttribute(UserSession.parentTenantId));
//集团版中针对某一商场的业务需要传递mallTenantId
String mallTenantId = request.getHeader("mallTenantId");
if(StringUtils.isBlank(mallTenantId)){
mallTenantId = request.getParameter("mallTenantId");
}
String tenantId = (String)request.getSession().getAttribute(UserSession.tenantId);
String parenTenantId = (String)request.getSession().getAttribute(UserSession.parentTenantId);
boolean isChildMall = false;
// if (StringUtils.isNotBlank(mallTenantId) && (!mallTenantId.equals(tenantId))) {
// parenTenantId = tenantId;
// tenantId = mallTenantId;
// isChildMall = true;
// }
// request.getSession().setAttribute(UserSession.tenantId,tenantId);
// request.getSession().setAttribute(UserSession.parentTenantId,parenTenantId);
request.getSession().setAttribute(Constant.IS_CHILD_MALL,isChildMall);
TenantThreadLocal.setCurrentThreadTenant(tenantId, parenTenantId);
TenantIgnore annotation = null;
if(handler instanceof HandlerMethod) {


+ 407
- 1
mallinkAdmin/src/main/resources/db/migration/V2022111500001__plat_coupon.sql View File

@@ -112,4 +112,410 @@ create table wx_coupon_mall_97 like wx_coupon_mall;
create table wx_coupon_mall_98 like wx_coupon_mall;
create table wx_coupon_mall_99 like wx_coupon_mall;

drop table wx_coupon_mall;
drop table wx_coupon_mall;


ALTER TABLE `mallink`.`wx_coupon_order_0`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_1`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_2`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_3`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_4`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_5`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_6`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_7`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_8`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_9`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_10`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_11`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_12`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_13`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_14`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_15`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_16`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_17`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_18`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_19`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_20`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_21`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_22`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_23`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_24`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_25`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_26`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_27`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_28`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_29`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_30`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_31`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_32`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_33`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_34`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_35`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_36`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_37`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_38`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_39`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_40`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_41`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_42`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_43`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_44`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_45`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_46`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_47`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_48`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_49`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_50`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_51`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_52`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_53`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_54`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_55`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_56`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_57`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_58`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_59`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_60`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_61`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_62`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_63`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_64`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_65`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_66`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_67`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_68`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_69`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_70`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_71`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_72`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_73`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_74`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_75`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_76`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_77`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_78`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_79`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_80`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_81`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_82`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_83`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_84`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_85`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_86`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_87`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_88`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_89`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_90`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_91`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_92`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_93`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_94`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_95`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_96`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_97`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_98`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;
ALTER TABLE `mallink`.`wx_coupon_order_99`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `b_merchant_id`;

ALTER TABLE `mallink`.`wx_profit_sharing_order_0`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_1`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_2`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_3`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_4`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_5`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_6`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_7`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_8`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_9`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_10`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_11`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_12`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_13`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_14`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_15`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_16`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_17`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_18`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_19`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_20`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_21`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_22`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_23`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_24`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_25`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_26`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_27`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_28`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_29`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_30`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_31`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_32`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_33`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_34`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_35`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_36`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_37`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_38`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_39`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_40`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_41`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_42`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_43`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_44`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_45`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_46`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_47`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_48`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_49`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_50`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_51`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_52`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_53`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_54`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_55`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_56`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_57`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_58`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_59`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_60`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_61`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_62`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_63`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_64`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_65`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_66`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_67`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_68`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_69`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_70`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_71`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_72`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_73`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_74`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_75`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_76`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_77`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_78`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_79`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_80`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_81`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_82`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_83`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_84`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_85`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_86`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_87`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_88`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_89`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_90`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_91`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_92`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_93`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_94`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_95`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_96`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_97`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_98`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;
ALTER TABLE `mallink`.`wx_profit_sharing_order_99`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;

ALTER TABLE `mallink`.`wx_profit_sharing_result`
ADD COLUMN `b_tenant_id` varchar(5) COMMENT 'b端核销商场tenantId' AFTER `merchant_id`;

+ 1
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java View File

@@ -401,7 +401,7 @@ public class WxCouponOrderController extends BaseController {
}

if (couponOrder != null && couponOrder.getMerchantId() != null) {
wxCouponOrderService.sendInsideCouponVerifyMsg(couponOrder, couponOrderId, couponOrder.getMerchantId(),couponOrder.getBMerchantId());
wxCouponOrderService.sendInsideCouponVerifyMsg(wxMerchantBUser,couponOrder, couponOrderId, couponOrder.getMerchantId(),couponOrder.getBMerchantId());
}

return new ResultData(couponOrder);


+ 0
- 48
mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java View File

@@ -80,54 +80,6 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
if(StringUtils.isBlank(mallTenantId)){
mallTenantId = request.getParameter("mallTenantId");
}
//
// String tenantId = null;
// String parenTenantId = null;
// boolean isChildMall = false;
// if (!StringUtils.isBlank(token)) {
// BaseCUserEntity user = cUserTokenService.getBByToken(token);
// if (user == null || user.getExpireTime().getTime() < System.currentTimeMillis()) {
// throw new MallinkException(ErrorCode.NET_TOKEN_INVALID.getCode(), "URL:" + request.getRequestURL() + " token失效,请重新登录");
// }
// if (StringUtils.isBlank(mallTenantId)) {
// tenantId = user.getTenantId();
// parenTenantId = user.getParentTenantId();
// }else {
// tenantId = mallTenantId;
// parenTenantId = user.getTenantId();
// isChildMall = true;
// }
// request.setAttribute(Constant.LOGIN_USER_KEY, user.getId());
// request.setAttribute(Constant.TENANT_ID, tenantId);
// request.setAttribute(Constant.REQUEST_C_USER_KEY, user);
// request.setAttribute(Constant.APP_INFO, user.getAppinfo());
// request.setAttribute(Constant.IS_CHILD_MALL,isChildMall);
// if (StringUtils.isNotBlank(parenTenantId)) {
// request.setAttribute(Constant.PARENT_TENANT_ID, parenTenantId);
// }
//
// }else if (!StringUtils.isBlank(bid)) {
// WxMerchantBUser buser = wxMerchantBUserService.getById(Long.parseLong(bid));
// if (buser == null) {
// throw new MallinkException(ErrorCode.NET_TOKEN_INVALID.getCode(), "URL:" + request.getRequestURL() + " bid失效,请重新登录");
// }
//
// if (StringUtils.isBlank(mallTenantId)) {
// tenantId = buser.getTenantId();
// parenTenantId = buser.getParentTenantId();
// }else {
// tenantId = mallTenantId;
// parenTenantId = buser.getTenantId();
// isChildMall = true;
// }
// request.setAttribute(Constant.LOGIN_B_USER_KEY, buser.getId());
// request.setAttribute(Constant.IS_CHILD_MALL,isChildMall);
// request.setAttribute(Constant.TENANT_ID, tenantId);
// if (StringUtils.isNotBlank(parenTenantId)) {
// request.setAttribute(Constant.PARENT_TENANT_ID, parenTenantId);
// }
// }

// 查询token信息
WxMerchantBUser buser = null;
String tenantId = null;


+ 1
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java View File

@@ -517,7 +517,7 @@ public class WxCouponOrderController extends BaseController {
}

if (couponOrder != null && couponOrder.getMerchantId() != null) {
wxCouponOrderService.sendInsideCouponVerifyMsg(couponOrder, couponOrderId, couponOrder.getMerchantId(),couponOrder.getBMerchantId());
wxCouponOrderService.sendInsideCouponVerifyMsg(couponOrder,couponOrder, couponOrderId, couponOrder.getMerchantId(),couponOrder.getBMerchantId());
}

return new ResultData(couponOrder);


+ 0
- 1
mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java View File

@@ -87,7 +87,6 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
String parenTenantId = null;
//设置userId到request里,后续根据userId,获取用户信息
request.setAttribute(Constant.LOGIN_USER_KEY, cUser.getId());

if(StringUtils.isNotBlank(mallTenantId)){
tenantId = mallTenantId;
WxMall mall = wxMallService.getByTenantId(tenantId);


+ 15
- 9
mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java View File

@@ -447,7 +447,8 @@ public class PosServiceImpl implements PosService {
* @param couponOrderIdStr
* @return
*/
public JSONObject oneCouponVerify(PromotionCalc promotionCalc,TenantEntity tenantinfo, String couponOrderIdStr, Long merchantId, Long buUserId, Long posOrderId) {
public JSONObject oneCouponVerify(PromotionCalc promotionCalc,TenantEntity tenantinfo, String couponOrderIdStr, Long merchantId,
Long buUserId,String mallTenantId, Long posOrderId) {
JSONObject retObj = new JSONObject();
Date now = new Date();
// 1. 获取券包信息
@@ -473,7 +474,7 @@ public class PosServiceImpl implements PosService {
}

try {
doVerify(retObj, EnumPosActionType.VERIFY_INDEPENT, couponOrderCVo, wxCoupon, merchantId, buUserId, posOrderId);
doVerify(retObj, EnumPosActionType.VERIFY_INDEPENT, couponOrderCVo, wxCoupon, merchantId, buUserId,mallTenantId, posOrderId);
} catch (MallinkException e) {
logger.error(e.getMessage());
throw new MallinkException(e.getErrorCode(), e.getMessage());
@@ -564,7 +565,8 @@ public class PosServiceImpl implements PosService {
* @param couponSelected
* @return
*/
private JSONObject oneCouponPay(PromotionCalc promotionCalc, WxCouponOrderCVo couponOrderCVo, Long merchantId, Long buUserId, Long posOrderId, boolean couponSelected) {
private JSONObject oneCouponPay(PromotionCalc promotionCalc, WxCouponOrderCVo couponOrderCVo, Long merchantId,
Long buUserId, String mallTenantId,Long posOrderId, boolean couponSelected) {
JSONObject retObj = new JSONObject();
Date curDate = new Date();

@@ -624,7 +626,7 @@ public class PosServiceImpl implements PosService {
throw new MallinkException(ErrorCode.COUPON_ORDER_IS_NULL);
}
try {
doVerify(retObj, EnumPosActionType.VERIFY_PAY, couponOrderCVo, wxCoupon, merchantId, buUserId, posOrderId);
doVerify(retObj, EnumPosActionType.VERIFY_PAY, couponOrderCVo, wxCoupon, merchantId, buUserId,mallTenantId, posOrderId);
} catch (MallinkException e) {
logger.error(e.getMessage());
throw new MallinkException(e.getErrorCode(), e.getMessage());
@@ -883,7 +885,7 @@ public class PosServiceImpl implements PosService {
String couponOrderIdStr = couponOrderArr.getString(0);
if (couponOrderIdStr != null) {
try {
JSONObject couponPromoMap = oneCouponVerify(promotionCalc,tenantEntity, couponOrderIdStr, merchantId, buUserId, posOrderId);
JSONObject couponPromoMap = oneCouponVerify(promotionCalc,tenantEntity, couponOrderIdStr, merchantId, buUserId,merchant.getTenantId(), posOrderId);
couponList.add(couponPromoMap);
} catch (MallinkException e) {
throw new MallinkException(e.getErrorCode(), e.getMessage());
@@ -967,7 +969,7 @@ public class PosServiceImpl implements PosService {
WxCouponOrderCVo couponOrderCVo = avaCoList.get(i);
boolean selCoupon = isSelCoupon(selCoArr, couponOrderCVo.getId());
try {
JSONObject couponObj = oneCouponPay(promotionCalc, couponOrderCVo, merchantId, buUserId, posOrderId, selCoupon);
JSONObject couponObj = oneCouponPay(promotionCalc, couponOrderCVo, merchantId, buUserId,merchant.getTenantId(), posOrderId, selCoupon);
couponList.add(couponObj);
} catch (MallinkException e) {
throw new MallinkException(e.getErrorCode(), e.getMessage());
@@ -1277,7 +1279,7 @@ public class PosServiceImpl implements PosService {
* @param posOrderId
*/
private void doVerify(JSONObject retMap, EnumPosActionType actionType, WxCouponOrderCVo couponOrderCVo, WxCoupon coupon,
Long merchantId, Long buUserId, Long posOrderId) {
Long merchantId, Long buUserId,String mallTenantId, Long posOrderId) {
int num = 0;
// 1. insert posOrderId
PosCouponOrderVerify posCouponOrderVerify = new PosCouponOrderVerify();
@@ -1307,6 +1309,7 @@ public class PosServiceImpl implements PosService {
}
couponOrder.setBUserId(buUserId);
couponOrder.setBMerchantId(merchantId);
couponOrder.setBTenantId(mallTenantId);
couponOrder.setUpdateDate(curDate);
if (couponOrderCVo.getBUserId() == null) {
num = couponOrderMapper.updateVerifyCouponOrder(couponOrder);
@@ -2172,15 +2175,18 @@ public class PosServiceImpl implements PosService {
}

// 4. 积分
WxMerchant wxMerchant = merchantMapper.selectById(merchantBUser.getMerchantId());
if (null == wxMerchant) {
throw new MallinkException(ErrorCode.COUPON_MERCHANT_NOT_FOUND);
}
try {
WxMerchant wxMerchant = merchantMapper.selectById(merchantBUser.getMerchantId());
int credit = posAddCredit(couponOrderCVo, wxCoupon, merchantBUser, wxMerchant);
scoreCreditCalc.setCredit(scoreCreditCalc.getCredit() + credit);
} catch (Exception e) {
logger.error("交易核销积分异常:" + e.getMessage());
}
// 3. 核销后处理
couponOrderService.sendInsideCouponVerifyMsg(merchantBUser, couponOrderId, merchantBUser.getMerchantId(),merchantBUser.getMerchantId());
couponOrderService.sendInsideCouponVerifyMsg(wxMerchant,merchantBUser, couponOrderId, merchantBUser.getMerchantId(),merchantBUser.getMerchantId());
}
return payOrder;
}


+ 1
- 1
mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java View File

@@ -134,7 +134,7 @@ public class CouponOrderExpiringSchedule {
}

if (couponOrder != null && couponOrder.getMerchantId() != null) {
wxCouponOrderService.sendInsideCouponVerifyMsg(couponOrder, couponOrder.getId(), couponOrder.getMerchantId(),couponOrder.getBMerchantId());
wxCouponOrderService.sendInsideCouponVerifyMsg(mall,couponOrder, couponOrder.getId(), couponOrder.getMerchantId(),couponOrder.getBMerchantId());
}
});
}


+ 1
- 1
mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java View File

@@ -72,7 +72,7 @@ public class SharingOrderRedoSchedule {
+ " ID:" +sharingOrder.getId()
+ " RES: wxPayOrder is null." );
}
ResultData result = wxProfitSharingOrderService.redoSharingOrder(sharingOrder,wxPayOrder);
ResultData result = wxProfitSharingOrderService.redoSharingOrder(mall,sharingOrder,wxPayOrder);
if (result.code != ResultData.SUCCESS) {
logger.error("分账重试失败:" + EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getMessage()
+ " ID:" +sharingOrder.getId()


+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java View File

@@ -43,6 +43,8 @@ public class WxCouponOrder extends TenantEntity {
private Long bMerchantId;
@TableField(exist = false)
private List<Long> bMerchantIdList;
@io.swagger.annotations.ApiModelProperty(value = "b端核销商场tenantId", name = "bTenantId")
private String bTenantId;
@io.swagger.annotations.ApiModelProperty(value = "操作券A端用户ID", name = "aUserId")
private Long aUserId;
@io.swagger.annotations.ApiModelProperty(value = "用户订单ID", name = "orderId")


+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingOrder.java View File

@@ -18,6 +18,8 @@ public class WxProfitSharingOrder extends TenantEntity {

@io.swagger.annotations.ApiModelProperty(value="核销商户ID",name="merchantId")
private Long merchantId;
@io.swagger.annotations.ApiModelProperty(value="b端核销商场tenantId",name="bTenantId")
private String bTenantId;
@io.swagger.annotations.ApiModelProperty(value="支付时收款商户,直连模式必须有",name="payMerchantId")
private Long payMerchantId;
@io.swagger.annotations.ApiModelProperty(value="支付时收款商户平台账号,直连模式必须有",name="payMerchantMchId")


+ 2
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingResult.java View File

@@ -16,7 +16,8 @@ public class WxProfitSharingResult extends TenantEntity {

@io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId")
private Long merchantId;

@io.swagger.annotations.ApiModelProperty(value="b端核销商场tenantId",name="bTenantId")
private String bTenantId;
@io.swagger.annotations.ApiModelProperty(value="分账订单号",name="sharingOrderId")
private Long sharingOrderId;
@io.swagger.annotations.ApiModelProperty(value="分账接收方id",name="sharingReceiverId")


+ 4
- 0
mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java View File

@@ -32,6 +32,10 @@ public class BaseMsg extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value="父租户id",name="parentTenantId")
private String parentTenantId;

@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value = "商场tenant", name = "mallTenantEntity")
private TenantEntity mallTenantEntity;
@io.swagger.annotations.ApiModelProperty(value="唯一标识",name="uuid")
@TableField(exist = false)
private String uuid;


+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideOrderPushMsg.java View File

@@ -1,5 +1,7 @@
package com.iformall.domain.po.msg;

import com.iformall.domain.po.base.TenantEntity;

import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java View File

@@ -77,6 +77,8 @@ public class WxOrderCouponVo extends TenantEntity {

@io.swagger.annotations.ApiModelProperty(value = "操作券B端小程序用户商户ID", name = "bMerchantId")
private Long bMerchantId;
@io.swagger.annotations.ApiModelProperty(value = "商场tenant", name = "bTenantId")
private String bTenantId;

/** 券类型信息 */
@io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,8.砍价券,9.团购券,100.消费卡)",name="type")
@@ -273,6 +275,7 @@ public class WxOrderCouponVo extends TenantEntity {
this.setCouponOrderId(couponOrder.getId());
this.setCouponOrderStatus(couponOrder.getCouponOrderStatus());
this.setBMerchantId(couponOrder.getBMerchantId());
this.setBTenantId(couponOrder.getBTenantId());
this.setShippingStatus(couponOrder.getShippingStatus());
this.setDeliveryInfo(couponOrder.getDeliveryInfo());
this.setCreateDate(couponOrder.getCreateDate());


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxCashOutService.java View File

@@ -49,6 +49,6 @@ public interface WxCashOutService {
*/
ResultData reCashout(WxMerchantBUser buser,WxCashOut record,EnumPayWay payWay);
void addCashOut(Long merchantId,Integer amount) throws MallinkException;
void addCashOut(WxMerchant merchant,Integer amount) throws MallinkException;
}

+ 2
- 2
mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java View File

@@ -66,7 +66,7 @@ public interface WxCouponOrderService {
/**
* 核销后发送消息
*/
void sendInsideCouponVerifyMsg(TenantEntity tenantEntity, Long couponOrderId, Long merchantId, Long bmerchantId);
void sendInsideCouponVerifyMsg(TenantEntity mallTenantEntity,TenantEntity couponOrderTenantEntity, Long couponOrderId, Long merchantId, Long bmerchantId);

/**
* 核销后处理
@@ -95,7 +95,7 @@ public interface WxCouponOrderService {
* 核销分账
* @param couponOrder
*/
void shareAfterVerify(WxCouponOrder couponOrder, Long merchantId,boolean mulityShare);
void shareAfterVerify(WxCouponOrder couponOrder, WxMerchant wxMerchant,boolean mulityShare);

/**
* 核销后补贴


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxOrderService.java View File

@@ -253,7 +253,7 @@ public interface WxOrderService {

void sendInsideOrderPushMsg(TenantEntity tenantEntity,Long composeOrderId);

void sendInsideOrderPushDeliveryMsg(TenantEntity tenantEntity,Long composeOrderId,Long couponOrderId);
void sendInsideOrderPushDeliveryMsg(TenantEntity couponOrderTenantEntity,Long composeOrderId,Long couponOrderId);

PageInfo<WxOrderCouponVo> listGoodsCAsPage(WxOrder wxOrder, Integer pageNum, Integer pageSize);



+ 3
- 2
mallinkService/src/main/java/com/iformall/service/WxProfitSharingOrderService.java View File

@@ -4,6 +4,7 @@ package com.iformall.service;
import com.github.pagehelper.PageInfo;
import com.iformall.common.ResultData;
import com.iformall.domain.dto.WxSharingOrderDto;
import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.po.WxPayOrder;
import com.iformall.domain.po.WxProfitSharingOrder;
import com.iformall.domain.po.base.TenantEntity;
@@ -21,12 +22,12 @@ public interface WxProfitSharingOrderService {
/**
* 创建分账订单
*/
ResultData createSharingOrder(WxSharingOrderDto wxSharingOrderDto,WxPayOrder payOrder);
ResultData createSharingOrder(TenantEntity mallTenantEntity,WxSharingOrderDto wxSharingOrderDto,WxPayOrder payOrder);

/**
* 分账重试
*/
ResultData redoSharingOrder(WxProfitSharingOrder sharingOrder,WxPayOrder payOrder);
ResultData redoSharingOrder(TenantEntity mallTenantEntity,WxProfitSharingOrder sharingOrder,WxPayOrder payOrder);

/**
* 分账完结重试


+ 3
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java View File

@@ -293,7 +293,9 @@ public class WxCardSpendServiceImpl implements WxCardSpendService {
//更新商户余额
if (real_payment > 0) {
wxCashOutService.addCashOut(couponMerchant.getMerchantId(), real_payment);
Long merchantId = couponMerchant.getMerchantId();
WxMerchant merchant = wxMerchantMapper.selectById(merchantId);
wxCashOutService.addCashOut(merchant, real_payment);
}
}
// }


+ 2
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxCashOutServiceImpl.java View File

@@ -321,8 +321,7 @@ public class WxCashOutServiceImpl implements WxCashOutService {
}

@Override
public void addCashOut(Long merchantId, Integer amount) throws MallinkException{
WxMerchant merchant = wxMerchantMapper.selectById(merchantId);
public void addCashOut(WxMerchant merchant, Integer amount) throws MallinkException{
WxMall mall = wxMallMapper.getByTenantId(merchant.getTenantId());
if (null != mall && mall.getCashOutSupport().intValue() == EnumCashOut.YES.getCode().intValue()) {
if (null != merchant) {
@@ -337,7 +336,7 @@ public class WxCashOutServiceImpl implements WxCashOutService {
redisLock.unlock("merchantLockCashSet_"+merchant.getId(), timeStr);
}catch(Exception e) {
redisLock.unlock("merchantLockCashSet_"+merchant.getId(), timeStr);
logger.error("addCashOut error."+merchantId,e);
logger.error("addCashOut error."+merchant.getId(),e);
throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"addCashOut error."+e.getMessage());
}finally {
redisLock.unlock("merchantLockCashSet_"+merchant.getId(), timeStr);


+ 173
- 91
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java View File

@@ -380,19 +380,32 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
return pageInfo;
}
private List<WxCouponOrderBVo> handleToCouponOrderBVoList(TenantEntity tenantEntity,List<WxCouponOrder> couponOrderList,boolean hasMerchant,boolean hasShop) {
private List<WxCouponOrderBVo> handleToCouponOrderBVoList(TenantEntity couponOrderTenantEntity,List<WxCouponOrder> couponOrderList,boolean hasMerchant,boolean hasShop) {
List<WxCouponOrderBVo> retList = null;
if (null != couponOrderList && couponOrderList.size() > 0 ) {
retList = new ArrayList<WxCouponOrderBVo>();
List<Long> bUserIdList = new ArrayList<Long>();
Map<String,List<Long>> mallBUserIdList = new HashMap<String,List<Long>>();
List<Long> cUserIdList = new ArrayList<Long>();
List<Long> couponIdList = new ArrayList<Long>();
List<String> mallTenantIdList = new ArrayList<String>();
for (int j = 0 ; j < couponOrderList.size(); j ++) {
WxCouponOrder co = couponOrderList.get(j);
Long bUserId = co.getBUserId();
if (null != bUserId && (!bUserIdList.contains(bUserId))) {
bUserIdList.add(bUserId);
if (null != bUserId ) {
String mallTenantId = co.getBTenantId();
if (!StringUtils.isBlank(mallTenantId)){
List<Long> bUserIdList = mallBUserIdList.get(mallTenantId);
if (null == bUserIdList) {
bUserIdList = new ArrayList<Long>();
}
if (bUserIdList.contains(bUserId)) {
bUserIdList.add(bUserId);
}
if (!mallTenantIdList.contains(mallTenantId)) {
mallTenantIdList.add(mallTenantId);
}
}
}
Long cUserId = co.getcUserId();
@@ -408,44 +421,62 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
//获取到buserId
Map<Long,WxMerchantBUser> bUserMap = new HashMap<Long,WxMerchantBUser>();
List<Long> merchantIdList = null;
if (bUserIdList.size() > 0 ) {
merchantIdList = new ArrayList<Long>();
WxMerchantBUser merchantBUserQ = new WxMerchantBUser();
merchantBUserQ.updateTenantInfo(tenantEntity);
merchantBUserQ.setIds(bUserIdList);
List<WxMerchantBUser> bUserList = wxMerchantBUserMapper.findSimpleList(merchantBUserQ);
if (null != bUserList) {
for (int k = 0 ; k < bUserList.size() ; k++) {
WxMerchantBUser b = bUserList.get(k);
bUserMap.put(b.getId(), b);
if (!merchantIdList.contains(b.getMerchantId())) {
merchantIdList.add(b.getMerchantId());
}
}
}
Map<String,List<Long>> mallMerchantIdList = null;
if (mallBUserIdList.size() > 0 ) {
mallMerchantIdList = new HashMap<String,List<Long>>();
for (Iterator<String> it = mallBUserIdList.keySet().iterator();it.hasNext();) {
String mallTenantId = it.next();
List<Long> bUserIdList = mallBUserIdList.get(mallTenantId);
if (null != bUserIdList && bUserIdList.size() > 0 ) {
WxMerchantBUser merchantBUserQ = new WxMerchantBUser();
merchantBUserQ.setTenantId(mallTenantId);
merchantBUserQ.setIds(bUserIdList);
List<WxMerchantBUser> bUserList = wxMerchantBUserMapper.findSimpleList(merchantBUserQ);
if (null != bUserList) {
List<Long> merchantIdList = mallMerchantIdList.get(mallTenantId);
if (null == merchantIdList) {
merchantIdList = new ArrayList<>();
}
for (int k = 0 ; k < bUserList.size() ; k++) {
WxMerchantBUser b = bUserList.get(k);
bUserMap.put(b.getId(), b);
if (!merchantIdList.contains(b.getMerchantId())) {
merchantIdList.add(b.getMerchantId());
}
}
}
}
}
}
//merchant
Map<Long,WxMerchant> merchantSimpleMap = new HashMap<Long,WxMerchant>();
if (null != merchantIdList && merchantIdList.size() > 0) {
WxMerchant merchantQ = new WxMerchant();
merchantQ.updateTenantInfo(tenantEntity);
merchantQ.setIds(merchantIdList);
List<WxMerchant> merchantList = wxMerchantMapper.findIdNameList(merchantQ);
if (null != merchantList) {
for (int k = 0 ; k < merchantList.size() ; k++) {
WxMerchant m = merchantList.get(k);
merchantSimpleMap.put(m.getId(), m);
}
if (null != mallMerchantIdList && mallMerchantIdList.size() > 0) {
for (Iterator<String> it = mallMerchantIdList.keySet().iterator();it.hasNext();) {
String mallTenantId = it.next();
List<Long> merchantIdList = mallMerchantIdList.get(mallTenantId);
if (null != merchantIdList && merchantIdList.size() > 0 ){
WxMerchant merchantQ = new WxMerchant();
merchantQ.setTenantId(mallTenantId);
merchantQ.setIds(merchantIdList);
List<WxMerchant> merchantList = wxMerchantMapper.findIdNameList(merchantQ);
if (null != merchantList) {
for (int k = 0 ; k < merchantList.size() ; k++) {
WxMerchant m = merchantList.get(k);
merchantSimpleMap.put(m.getId(), m);
}
}
}
}
}
//获取到cUserId
Map<Long,WxCUserBasicInfo> cUserSimpleMap = new HashMap<Long,WxCUserBasicInfo>();
if (cUserIdList.size() > 0 ) {
WxCUserBasicInfo cBasicInfoQ = new WxCUserBasicInfo();
cBasicInfoQ.setFinalTenantId(tenantEntity.getFinalTenantId());
cBasicInfoQ.setFinalTenantId(couponOrderTenantEntity.getFinalTenantId());
cBasicInfoQ.setIds(cUserIdList);
List<WxCUserBasicInfo> cUserBasicInfoList = wxCUserBasicInfoMapper.findListPhoneAndNameByIds(cBasicInfoQ);
if (null != cUserBasicInfoList) {
@@ -460,7 +491,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
Map<Long,WxCoupon> couponMap = new HashMap<Long,WxCoupon>();
if (couponIdList.size() > 0 ) {
WxCoupon couponQ = new WxCoupon();
couponQ.updateTenantInfo(tenantEntity);
couponQ.updateTenantInfo(couponOrderTenantEntity);
couponQ.setIds(couponIdList);
List<WxCoupon> couponList = wxCouponMapper.findTenantSimpleList(couponQ);
if (null != couponList) {
@@ -470,13 +501,28 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
}
}
}
Map<Long, List<WxMerchantVo>> couponMerchantVoMap = null;
Map<String,Map<Long, List<WxMerchantVo>>> mallCouponMerchantVoMap = null;
if (hasMerchant) {
couponMerchantVoMap = wxMerchantService.findCouponMerchantVoList(couponIdList, tenantEntity,hasShop);
if (mallTenantIdList.size() > 0 ) {
mallCouponMerchantVoMap = new HashMap<String,Map<Long, List<WxMerchantVo>>>();
for (int i = 0 ; i < mallTenantIdList.size();i++) {
String mallTenantId = mallTenantIdList.get(i);
TenantEntity mallTenantEntity = new TenantEntity();
mallTenantEntity.setTenantId(mallTenantId);
Map<Long, List<WxMerchantVo>> couponMerchantVoMap = wxMerchantService.findCouponMerchantVoList(couponIdList, mallTenantEntity,hasShop);
mallCouponMerchantVoMap.put(mallTenantId, couponMerchantVoMap);
}
}
}
for (int i = 0 ; i < couponOrderList.size() ; i ++) {
WxCouponOrder couponOrder = couponOrderList.get(i);
Map<Long, List<WxMerchantVo>> couponMerchantVoMap = null;
if (!StringUtils.isBlank(couponOrder.getBTenantId())) {
if (null != mallCouponMerchantVoMap){
couponMerchantVoMap = mallCouponMerchantVoMap.get(couponOrder.getBTenantId());
}
}
WxCouponOrderBVo bvo = couponOrdertoBVo(couponOrder,bUserMap,merchantSimpleMap,cUserSimpleMap,couponMap,hasMerchant,couponMerchantVoMap);
if (null != bvo ) {
retList.add(bvo);
@@ -849,28 +895,44 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
return new ResultData(retPageInfo);
}
private List<WxCouponOrderBVo> handleQueryResult(boolean cUserEntry,List<WxCouponOrder> list,TenantEntity tenantEntity) {
private List<WxCouponOrderBVo> handleQueryResult(boolean cUserEntry,List<WxCouponOrder> list,TenantEntity couponOrderTenantEntity) {
if (null != list && list.size() > 0) {

//循环list,获取 cUserId
List<Long> cUserIdList = new ArrayList<Long>();
List<Long> bUserIdList = new ArrayList<Long>();
List<Long> merchantIdList = new ArrayList<Long>();
Map<String,List<Long>> mallBUserIdList = new HashMap<String,List<Long>>();
Map<String,List<Long>> mallMerchantIdList = new HashMap<String,List<Long>>();
List<Long> couponIdList = new ArrayList<Long>();
List<String> mallTenantIdList = new ArrayList<String>();
for (int i = 0 ; i < list.size() ; i ++ ) {
WxCouponOrder bo = list.get(i);
Long cusrid = bo.getcUserId();
if (null != cusrid && (!cUserIdList.contains(cusrid))) {
cUserIdList.add(cusrid);
}
Long bUserId = bo.getBUserId();
if(null != bUserId && (!bUserIdList.contains(bUserId))){
bUserIdList.add(bUserId);
}

Long bmerchantId = bo.getBMerchantId();
if (null != bmerchantId && (!merchantIdList.contains(bmerchantId))) {
merchantIdList.add(bmerchantId);
if (!StringUtils.isBlank(bo.getBTenantId())){
List<Long> bUserIdList = mallBUserIdList.get(bo.getBTenantId());
if (null == bUserIdList) {
bUserIdList = new ArrayList<Long>();
}
Long bUserId = bo.getBUserId();
if(null != bUserId && (!bUserIdList.contains(bUserId))){
bUserIdList.add(bUserId);
}
List<Long> merchantIdList = mallMerchantIdList.get(bo.getBTenantId());
if (null == merchantIdList) {
merchantIdList = new ArrayList<Long>();
}
Long bmerchantId = bo.getBMerchantId();
if (null != bmerchantId && (!merchantIdList.contains(bmerchantId))) {
merchantIdList.add(bmerchantId);
}
if (!mallTenantIdList.contains(bo.getBTenantId())) {
mallTenantIdList.add(bo.getBTenantId());
}
}
Long couponId = bo.getCouponId();
if (null != couponId && (!couponIdList.contains(couponId))) {
@@ -879,37 +941,50 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
}

Map<Long,WxMerchantBUser> buserPhoneMap = new HashMap<Long,WxMerchantBUser>();
if(bUserIdList.size() > 0){
WxMerchantBUser buserQ = new WxMerchantBUser();
buserQ.updateTenantInfo(tenantEntity);
buserQ.setIds(bUserIdList);
List<WxMerchantBUser> bUserList = wxMerchantBUserMapper.findSimpleList(buserQ);
if(null != bUserList && bUserList.size() > 0){
for (WxMerchantBUser bUser: bUserList) {
buserPhoneMap.put(bUser.getId(),bUser);
}
}
if(mallBUserIdList.size() > 0){
for (Iterator<String> it = mallBUserIdList.keySet().iterator();it.hasNext();) {
String mallTenantId = it.next();
List<Long> bUserIdList = mallBUserIdList.get(mallTenantId);
if (null != bUserIdList && bUserIdList.size() > 0 ) {
WxMerchantBUser buserQ = new WxMerchantBUser();
buserQ.setTenantId(mallTenantId);
buserQ.setIds(bUserIdList);
List<WxMerchantBUser> bUserList = wxMerchantBUserMapper.findSimpleList(buserQ);
if(null != bUserList && bUserList.size() > 0){
for (WxMerchantBUser bUser: bUserList) {
buserPhoneMap.put(bUser.getId(),bUser);
}
}
}
}
}
Map<Long,String> merchantNameMap = new HashMap<Long,String>();
if (null != merchantIdList && merchantIdList.size() > 0 ) {
WxMerchant merchantQ = new WxMerchant();
merchantQ.updateTenantInfo(tenantEntity);
// merchantQ.setIds(merchantIdList);
List<WxMerchant> merchantList = wxMerchantMapper.findIdNameList(merchantQ);
if (null != merchantList) {
for (int i = 0 ; i < merchantList.size() ; i ++) {
WxMerchant m = merchantList.get(i);
merchantNameMap.put(m.getId(), m.getName());
}
}
if (null != mallMerchantIdList && mallMerchantIdList.size() > 0 ) {
for (Iterator<String> it = mallMerchantIdList.keySet().iterator();it.hasNext();) {
String mallTenantIt = it.next();
List<Long> merchantIdList = mallMerchantIdList.get(mallTenantIt);
if (null != merchantIdList && merchantIdList.size() > 0 ) {
WxMerchant merchantQ = new WxMerchant();
merchantQ.setTenantId(mallTenantIt);
merchantQ.setIds(merchantIdList);
List<WxMerchant> merchantList = wxMerchantMapper.findIdNameList(merchantQ);
if (null != merchantList) {
for (int i = 0 ; i < merchantList.size() ; i ++) {
WxMerchant m = merchantList.get(i);
merchantNameMap.put(m.getId(), m.getName());
}
}
}
}
}
Map<Long,WxCoupon> couponMap = new HashMap<Long,WxCoupon>();
Map<Long,Long> merchantProductIdMap = new HashMap<Long,Long>();
if (null != couponIdList && couponIdList.size() > 0 ) {
WxCoupon couponQ = new WxCoupon();
couponQ.updateTenantInfo(tenantEntity);
couponQ.updateTenantInfo(couponOrderTenantEntity);
couponQ.setIds(couponIdList);
List<WxCoupon> couponList = wxCouponMapper.findTenantSimpleList(couponQ);
if (null != couponList) {
@@ -919,24 +994,27 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
}
}

List<WxMerchantProductVo> merchantProductVos = wxCouponMerchantMapper.findMerchantProduct(tenantEntity.getTenantId(), couponIdList);
if (null != merchantProductVos) {
for (int i = 0 ; i < merchantProductVos.size(); i ++) {
WxMerchantProductVo mp = merchantProductVos.get(i);
if (mp.getMc() > 1) {
merchantProductIdMap.put(mp.getProductId(), -999L);
}else {
merchantProductIdMap.put(mp.getProductId(), mp.getMerchantId());
for (int i = 0 ; i < mallTenantIdList.size(); i++) {
List<WxMerchantProductVo> merchantProductVos = wxCouponMerchantMapper.findMerchantProduct(mallTenantIdList.get(i), couponIdList);
if (null != merchantProductVos) {
for (int j = 0 ; j < merchantProductVos.size(); j ++) {
WxMerchantProductVo mp = merchantProductVos.get(j);
if (mp.getMc() > 1) {
merchantProductIdMap.put(mp.getProductId(), -999L);
}else {
merchantProductIdMap.put(mp.getProductId(), mp.getMerchantId());
}
}
}
}
}
}
Map<Long,WxCUserBasicInfo> cUserMap = new HashMap<Long,WxCUserBasicInfo>();
if (cUserIdList.size() > 0) {
WxCUserBasicInfo cUserBasicInfoQ = new WxCUserBasicInfo();
cUserBasicInfoQ.setIds(cUserIdList);
cUserBasicInfoQ.setFinalTenantId(tenantEntity.getFinalTenantId());
cUserBasicInfoQ.setFinalTenantId(couponOrderTenantEntity.getFinalTenantId());
List<WxCUserBasicInfo> cuserList = wxCUserBasicInfoService.listPhoneAndNameByIds(cUserBasicInfoQ);
if (null != cuserList) {
for (int i = 0 ; i < cuserList.size() ; i++) {
@@ -1196,7 +1274,6 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {

@Override
public ResultData detailAdminVo(Long couponOrderId,TenantEntity tenantinfo) {

WxCouponOrder couponOrder = wxCouponOrderMapper.findDetailOfAdmin(couponOrderId,tenantinfo.getTenantId());
if (null == couponOrder) {
return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL);
@@ -1332,6 +1409,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
couponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); //1核销
couponOrder.setBUserId(bUser==null?0l:bUser.getId());
couponOrder.setBMerchantId(bUser==null?0l:bUser.getMerchantId());
couponOrder.setBTenantId(bUser==null?null:bUser.getTenantId());
couponOrder.setVerifyType(couponVerifyType.getCode());
if(EnumCouponVerifyType.VERIFY_B.equals(couponVerifyType)
&& StringUtils.isNotBlank(couponOrder.getVerifyRemark())){
@@ -1458,7 +1536,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
}

if (couponOrder != null && couponOrder.getMerchantId() != null) {
this.sendInsideCouponVerifyMsg(couponOrder, couponOrderId, couponOrder.getMerchantId(),couponOrder.getBMerchantId());
this.sendInsideCouponVerifyMsg(wxMerchantBUser,couponOrder, couponOrderId, couponOrder.getMerchantId(),couponOrder.getBMerchantId());
}
return couponOrder;
@@ -1581,13 +1659,14 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
}

@Override
public void sendInsideCouponVerifyMsg(TenantEntity tenantEntity, Long couponOrderId, Long merchantId, Long bmerchantId) {
public void sendInsideCouponVerifyMsg(TenantEntity mallTenantEntity,TenantEntity couponOrderTenantEntity, Long couponOrderId, Long merchantId, Long bmerchantId) {
if(bmerchantId == null || bmerchantId.longValue() == 0l){
bmerchantId = merchantId;
}
FmInsideCouponVerifyMsg verifyMsg = new FmInsideCouponVerifyMsg();
verifyMsg.setMsgType(EnumMsgRecordType.INSIDE_COUPON_VERIFY.getCode());
verifyMsg.updateTenantInfo(tenantEntity);
verifyMsg.updateTenantInfo(couponOrderTenantEntity);
verifyMsg.setMallTenantEntity(mallTenantEntity);
verifyMsg.setCouponOrderId(couponOrderId);
verifyMsg.setMerchantId(merchantId);
verifyMsg.setBmerchantId(bmerchantId);
@@ -1611,7 +1690,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
}
}
// 核销分账
shareAfterVerify(couponOrder, merchant.getId(),mulityShare);
shareAfterVerify(couponOrder, merchant,mulityShare);
} catch (Exception e) {
logger.error("核销记账失败"+e.getMessage(),e);
}
@@ -1639,10 +1718,10 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
}

@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
public WxMerchantSubsidy recordAfterVerified(WxCouponOrder couponOrder, Long merchantId) {
public WxMerchantSubsidy recordAfterVerified(WxCouponOrder couponOrder, WxMerchant wxMerchant) {
WxCoupon wxCoupon = wxCouponMapper.selectById(couponOrder.getCouponId(),couponOrder.getTenantId());
WxMerchantSubsidy merchantSubsidy = new WxMerchantSubsidy();
merchantSubsidy.updateTenantInfo(couponOrder);
merchantSubsidy.updateTenantInfo(wxMerchant);
if (couponOrder.getCouponType().equals(EnumCouponType.COUPON_PRESS.getCode())
&& couponOrder.getCouponPrice().equals(wxCoupon.getSalePrice())) {
//砍价
@@ -1675,7 +1754,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
final IdWorker idWorker = IdWorker.get();
Date curDate = new Date();
merchantSubsidy.setId(idWorker.nextId());
merchantSubsidy.setMerchantId(merchantId);
merchantSubsidy.setMerchantId(wxMerchant.getId());
merchantSubsidy.setOrderPayment(couponOrder.getCouponPrice());
merchantSubsidy.setReceiverPayment(couponOrder.getCouponPrice());
merchantSubsidy.setRealPayment(couponOrder.getCouponPrice());
@@ -1689,14 +1768,14 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
//是否开通了商户提现,开通了商户提现往商户账户里面加金额
cashOutService.addCashOut(merchantId, couponOrder.getCouponPrice());
cashOutService.addCashOut(wxMerchant, couponOrder.getCouponPrice());
return merchantSubsidy;
}

@Override
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
public void shareAfterVerify(WxCouponOrder couponOrder, Long merchantId, boolean mulityShare) {
public void shareAfterVerify(WxCouponOrder couponOrder, WxMerchant wxMerchant, boolean mulityShare) {
// 微信分账
try {

@@ -1714,7 +1793,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
try {
// 订单购买时未分账 核销记账,并且往账户里面记帐
if (couponOrder.getCouponPrice() > 0) {
recordAfterVerified(couponOrder, merchantId);
recordAfterVerified(couponOrder, wxMerchant);
}
Date time = DateUtils.stringToDate("2022-09-22 23:00:00", "yyyy-MM-dd HH:mm:ss");
if(EnumPayWay.PAY_WAY_WECHAT.getCode().equals(wxPayOrder.getPayVendor())
@@ -1733,7 +1812,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
}
WxSharingOrderDto wxSharingOrderDto = new WxSharingOrderDto();
wxSharingOrderDto.setCUserId(wxPayOrder.getCUserId());
wxSharingOrderDto.setMerchantId(merchantId);
wxSharingOrderDto.setMerchantId(wxMerchant.getId());
if (mulityShare) {
wxSharingOrderDto.setType(EnumProfitSharingOrderType.PROFIT_SHARING_MULTI.getCode());
}else {
@@ -1746,7 +1825,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
wxSharingOrderDto.setPayTimeEnd(wxPayOrder.getPayTimeEnd());
wxSharingOrderDto.updateTenantInfo(wxPayOrder);
wxSharingOrderDto.setTransactionId(wxPayOrder.getTransactionId());
wxProfitSharingOrderService.createSharingOrder(wxSharingOrderDto,wxPayOrder);
wxProfitSharingOrderService.createSharingOrder(wxMerchant,wxSharingOrderDto,wxPayOrder);
} catch (Exception e) {
logger.error("微信分账: " + e.getMessage());
}
@@ -2629,7 +2708,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
try {
couponOrder.setCouponOrderStatus(EnumCouponOrderStatus.POS_PRE_VERIFY.getCode()); //预核销
couponOrder.setBUserId(bUser.getId());
couponOrder.setBMerchantId(bUser.getMerchantId());;
couponOrder.setBMerchantId(bUser.getMerchantId());
couponOrder.setBTenantId(bUser.getTenantId());
couponOrder.setVerifyType(EnumCouponVerifyType.VERIFY_B.getCode());
couponOrder.setVerifyRemark(EnumCouponVerifyType.VERIFY_B_10.getMessage());
couponOrder.setUpdateDate(new Date());
@@ -2666,6 +2746,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
couponOrder.setCouponOrderStatus(EnumCouponOrderStatus.POS_PRE_VERIFY.getCode()); //预核销
couponOrder.setBUserId(bUser.getId());
couponOrder.setBMerchantId(bUser.getMerchantId());
couponOrder.setBTenantId(bUser.getTenantId());
couponOrder.setVerifyType(EnumCouponVerifyType.VERIFY_B.getCode());
couponOrder.setVerifyRemark(EnumCouponVerifyType.VERIFY_B_10.getMessage());
couponOrder.setUpdateDate(new Date());
@@ -2747,6 +2828,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
updateCouponOrder.setId(couponOrderId);
updateCouponOrder.setBUserId(bUser.getId());
updateCouponOrder.setBMerchantId(bUser.getMerchantId());
updateCouponOrder.setBTenantId(bUser.getTenantId());
updateCouponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode());
updateCouponOrder.setUpdateDate(new Date());
updateCouponOrder.setPayVendor(payWay.getCode());


+ 4
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java View File

@@ -2609,7 +2609,7 @@ public class WxOrderServiceImpl implements WxOrderService {
sharingOrder.setPayTimeEnd(wxPayOrder.getPayTimeEnd());
sharingOrder.updateTenantInfo(wxPayOrder);
sharingOrder.setTransactionId(wxPayOrder.getTransactionId());
wxProfitSharingOrderService.createSharingOrder(sharingOrder,wxPayOrder);
wxProfitSharingOrderService.createSharingOrder(wxMerchantBUser,sharingOrder,wxPayOrder);

} else {
logger.error("微信分账: 未找到payorder or merchant at orderid-" + orderId);
@@ -3482,12 +3482,13 @@ public class WxOrderServiceImpl implements WxOrderService {
}

@Override
public void sendInsideOrderPushDeliveryMsg(TenantEntity tenantEntity, Long composeOrderId,Long couponOrderId) {
public void sendInsideOrderPushDeliveryMsg(TenantEntity couponOrderTenantEntity, Long composeOrderId,Long couponOrderId) {
try{
FmInsideOrderPushMsg orderPush = new FmInsideOrderPushMsg();
orderPush.setDelayTimeLevel(3);
orderPush.setMsgType(EnumMsgRecordType.INSIDE_ORDER_PUSH_DELIVERY.getCode());
orderPush.updateTenantInfo(tenantEntity);
orderPush.updateTenantInfo(couponOrderTenantEntity);
//orderPush.setMallTenantEntity(mallTenantEntity);
orderPush.setBatchOrderId(composeOrderId);
orderPush.setCouponOrderId(couponOrderId);
logger.info(">>>>>>>>>>>send sendInsideOrderPushMsg :"+orderPush);


+ 8
- 7
mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java View File

@@ -1117,7 +1117,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
logger.error(e.getMessage());
}
// 更新后处理
wxCouponOrderService.sendInsideCouponVerifyMsg(unPayOrder, unPayOrder.getPosPayOrderId(), user.getMerchantId(),user.getMerchantId());
wxCouponOrderService.sendInsideCouponVerifyMsg(user,unPayOrder, unPayOrder.getPosPayOrderId(), user.getMerchantId(),user.getMerchantId());
}
}
} catch (Exception e) {
@@ -1149,7 +1149,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
if (record.getShare().equals(EnumPayShare.NO.getCode())) {
//结算记录
try {
proxy.createMerchantSubsidy(record, composeOrder.getSingleOrder(), new Date(),true);
proxy.createMerchantSubsidy(user,record, composeOrder.getSingleOrder(), new Date(),true);
} catch (Exception e) {
logger.error("收银台结算记录失败,{}", e.getMessage());
}
@@ -1238,7 +1238,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
logger.error(e.getMessage());
}
// 更新后处理
wxCouponOrderService.sendInsideCouponVerifyMsg(unPayOrder, unPayOrder.getPosPayOrderId(), user.getMerchantId(),user.getMerchantId());
wxCouponOrderService.sendInsideCouponVerifyMsg(user,unPayOrder, unPayOrder.getPosPayOrderId(), user.getMerchantId(),user.getMerchantId());
}
}
} catch (Exception e) {
@@ -1247,15 +1247,15 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
}

@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
public void createMerchantSubsidy(WxPayOrder record, WxOrder order, Date curDate,boolean freshMerchantCash) {
public void createMerchantSubsidy(WxMerchantBUser user,WxPayOrder record, WxOrder order, Date curDate,boolean freshMerchantCash) {
final IdWorker idWorker = IdWorker.get();
WxMerchantSubsidy merchantSubsidy = new WxMerchantSubsidy();
merchantSubsidy.setId(idWorker.nextId());
merchantSubsidy.updateTenantInfo(order);
merchantSubsidy.setOrderId(order.getId());
merchantSubsidy.setOrderType(EnumOrderType.MICROPAY.getCode());
WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectById(order.getProductId());
merchantSubsidy.setMerchantId(wxMerchantBUser.getMerchantId());
//WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectById(order.getProductId());
merchantSubsidy.setMerchantId(user.getMerchantId());
merchantSubsidy.setCouponOrderId(0L);
merchantSubsidy.setCouponType(0);
if (null == record.getPayAmount()) {
@@ -1279,7 +1279,8 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
wxMerchantSubsidyMapper.insert(merchantSubsidy);
if (freshMerchantCash && (null!=record.getShare() && EnumPayShare.NO.getCode().intValue()==record.getShare().intValue())) {
cashOutService.addCashOut(wxMerchantBUser.getMerchantId(), merchantSubsidy.getRealPayment());
WxMerchant merchant = wxMerchantMapper.selectById(user.getMerchantId());
cashOutService.addCashOut(merchant, merchantSubsidy.getRealPayment());
}
}



+ 10
- 8
mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java View File

@@ -179,7 +179,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ

@Override
// @Transactional(isolation=Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED, rollbackFor = {Exception.class})
public ResultData redoSharingOrder(WxProfitSharingOrder sharingOrder,WxPayOrder payOrder) {
public ResultData redoSharingOrder(TenantEntity mallTenantEntity,WxProfitSharingOrder sharingOrder,WxPayOrder payOrder) {

if(!EnumProfitSharingOrderStatus.shareStatus().contains(sharingOrder.getSharingStatus())){
return new ResultData(ErrorCode.PROFIT_SHARING_REQUEST_FAILED.getCode(),"分账状态不允许");
@@ -218,7 +218,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ
EnumPayWay enumPayWay = EnumPayWay.getEnum(payOrder.getPayVendor());
EnumAppPlat enumPlat = enumPayWay.getPlat();

WxAppinfo cAppInfo = wxAppinfoService.getCAppInfo(sharingOrder, enumPlat);
WxAppinfo cAppInfo = wxAppinfoService.getCAppInfo(mallTenantEntity, enumPlat);
WxPayAccount payAccount = wxPayAccountMapper.selectById(cAppInfo.getPayId());

WxComposeChildOrderShare wxComposeChildOrderShare = null;
@@ -244,7 +244,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ
wxComposeChildOrderShare.setSellerAmount(sellerAmount);
boolean isSeller = false;
if(sellerAmount > 0){
WxProfitSharingReceiver receiver = getByMerchantAdmin(payOrder,payShareAdapterService,wxComposeChildOrderShare.getMerchantId(),EnumMerchantAdmin.PRIVATE_SELL,payOrder.getTtPayWay(), payOrder.getMchType());
WxProfitSharingReceiver receiver = getByMerchantAdmin(mallTenantEntity,payShareAdapterService,wxComposeChildOrderShare.getMerchantId(),EnumMerchantAdmin.PRIVATE_SELL,payOrder.getTtPayWay(), payOrder.getMchType());
if(receiver != null){
JSONObject jo = new JSONObject();
jo.put("type",payShareAdapterService.getShareAccount(receiver.getReceiverType()).getMessage());
@@ -267,7 +267,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ
}
boolean isSystem = false;
if(systemAmount > 0){
WxProfitSharingReceiver receiver = getByMerchantAdmin(payOrder,payShareAdapterService,wxComposeChildOrderShare.getMerchantId(),EnumMerchantAdmin.PRIVATE_SYSTEM,payOrder.getTtPayWay(), payOrder.getMchType());
WxProfitSharingReceiver receiver = getByMerchantAdmin(mallTenantEntity,payShareAdapterService,wxComposeChildOrderShare.getMerchantId(),EnumMerchantAdmin.PRIVATE_SYSTEM,payOrder.getTtPayWay(), payOrder.getMchType());
if(receiver != null){
JSONObject jo = new JSONObject();
jo.put("type",payShareAdapterService.getShareAccount(receiver.getReceiverType()).getMessage());
@@ -292,7 +292,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ
}
boolean isMall = false;
if(mallAmount > 0){
WxProfitSharingReceiver receiver = getByMerchantAdmin(payOrder,payShareAdapterService,wxComposeChildOrderShare.getMerchantId(),EnumMerchantAdmin.PUBLIC_ADMIN,payOrder.getTtPayWay(), payOrder.getMchType());
WxProfitSharingReceiver receiver = getByMerchantAdmin(mallTenantEntity,payShareAdapterService,wxComposeChildOrderShare.getMerchantId(),EnumMerchantAdmin.PUBLIC_ADMIN,payOrder.getTtPayWay(), payOrder.getMchType());
if(receiver != null){
JSONObject jo = new JSONObject();
jo.put("type",payShareAdapterService.getShareAccount(receiver.getReceiverType()).getMessage());
@@ -315,7 +315,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ
//商户所得
int shareAmount = wxComposeChildOrderShare.getShareAmount() + surplus;

WxProfitSharingReceiver receiver = payShareAdapterService.getReceiver(sharingOrder,sharingOrder.getMerchantId(),payOrder.getTtPayWay(),payOrder.getMchType());
WxProfitSharingReceiver receiver = payShareAdapterService.getReceiver(mallTenantEntity,sharingOrder.getMerchantId(),payOrder.getTtPayWay(),payOrder.getMchType());
if(EnumPayMchType.TOTAL.getCode().equals(payOrder.getMchType()) && EnumPayShare.YES.getCode().equals(payOrder.getShare())){
JSONObject jo = new JSONObject();
jo.put("type",payShareAdapterService.getShareAccount(receiver.getReceiverType()).getMessage());
@@ -385,6 +385,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ
result.setId(idworker.nextId());
result.updateTenantInfo(sharingOrder);
result.setMerchantId(Long.valueOf(o.getString("merchantId")));
result.setBTenantId(mallTenantEntity.getTenantId());
result.setSharingOrderId(sharingOrder.getId());
result.setSharingReceiverId(Long.valueOf(o.getString("description")));
result.setPayAmount(o.getInteger("amount"));
@@ -405,7 +406,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ

@Override
// @Transactional(isolation=Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED, rollbackFor = {Exception.class})
public ResultData createSharingOrder(WxSharingOrderDto sharingOrderDto,WxPayOrder payOrder) {
public ResultData createSharingOrder(TenantEntity mallTenantEntity,WxSharingOrderDto sharingOrderDto,WxPayOrder payOrder) {

// PayShareAdapterService payShareAdapterService = payServiceFactory.getPayShareAdapterService(payOrder.getPayVendor(),payOrder.getPayVersion());
//创建分账订单
@@ -439,6 +440,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ
record.setSingleOrderAmount(childOrderShare.getRealPayMent());
record.setPayAmount(payOrder.getPayAmount());
record.setMerchantId(sharingOrderDto.getMerchantId());
record.setBTenantId(mallTenantEntity.getTenantId());
//直连模式,
if (payOrder.getMchType() == EnumPayMchType.DIRECT.getCode()) {
if (null == childOrderShare.getMerchantId()) {
@@ -459,7 +461,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ
}

//实际调用分账
ResultData resultData = redoSharingOrder(record,payOrder);
ResultData resultData = redoSharingOrder(mallTenantEntity,record,payOrder);
return resultData;
}



+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java View File

@@ -276,6 +276,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {
wxCouponOrder.setBUserId(bUser.getId());
wxCouponOrder.setAUserId(payType.getCode().longValue());
wxCouponOrder.setBMerchantId(bUser.getMerchantId());
wxCouponOrder.setBTenantId(bUser.getTenantId());
} else if (payType == EnumPayType.PAY_ADMIN_REFUND) {
wxCouponOrder.setBUserId(payType.getCode().longValue());
wxCouponOrder.setAUserId(aUserId);


+ 2
- 1
mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCouponVerifyMsgServiceImpl.java View File

@@ -2,6 +2,7 @@ package com.iformall.service.msg.impl;

import com.iformall.common.ErrorCode;
import com.iformall.domain.po.*;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.po.msg.BaseMsg;
import com.iformall.domain.po.msg.FmInsideCouponVerifyMsg;
import com.iformall.enums.EnumCouponOrderStatus;
@@ -42,7 +43,7 @@ public class FmInsideCouponVerifyMsgServiceImpl implements MsgSendService {
logger.error("券包ID未找到: " + msg.getCouponOrderId());
throw new MallinkException(ErrorCode.COUPON_ORDER_IS_NULL.getCode(), "券包ID未找到" + msg.getCouponOrderId());
}
TenantEntity mallTenantEntity = msg.getMallTenantEntity();
WxMerchant merchant = merchantService.selectById(msg.getMerchantId());
if(merchant == null) {
logger.error("门店未找到: " + msg.getMerchantId());


+ 6
- 1
mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderPushDeliveryMsgServiceImpl.java View File

@@ -75,6 +75,11 @@ public class FmInsideOrderPushDeliveryMsgServiceImpl implements MsgSendService {
TenantEntity tenantEntity = new TenantEntity();
tenantEntity.setTenantId(msg.getTenantId());
tenantEntity.setParentTenantId(msg.getParentTenantId());
// TenantEntity mallTenantEntity = msg.getMallTenantEntity();
// if (null == mallTenantEntity) {
// mallTenantEntity = tenantEntity;
// }

try{
WxCouponOrder couponOrder = wxCouponOrderService.getById(msg.getCouponOrderId(), tenantEntity.getTenantId());
@@ -88,7 +93,7 @@ public class FmInsideOrderPushDeliveryMsgServiceImpl implements MsgSendService {
TtMerchantPoi poi = ttMerchantPoiService.getById(couponOrder.getBMerchantId());


WxAppinfo appinfo = wxAppinfoService.getCAppInfo(tenantEntity,EnumPayWay.PAY_WAY_TT.getPlat());
WxAppinfo appinfo = wxAppinfoService.getCAppInfo(couponOrder,EnumPayWay.PAY_WAY_TT.getPlat());
WxPayAccount payAccount = wxPayAccountService.getById(appinfo.getPayId());
TtPayService ttPayService = maUtil.getTtPayService(appinfo, payAccount);



+ 16
- 11
mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml View File

@@ -11,6 +11,7 @@
<result column="owner_id" jdbcType="BIGINT" property="ownerId" />
<result column="b_user_id" jdbcType="BIGINT" property="bUserId" />
<result column="b_merchant_id" jdbcType="BIGINT" property="bMerchantId" />
<result column="b_tenant_id" jdbcType="VARCHAR" property="bTenantId" />
<result column="a_user_id" jdbcType="BIGINT" property="aUserId" />
<result column="order_id" jdbcType="BIGINT" property="orderId" />
<result column="expired_time" jdbcType="TIMESTAMP" property="expiredTime" />
@@ -40,7 +41,7 @@
</resultMap>

<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`coupon_id`,`coupon_type`,`c_user_id`,`owner_id`,`b_user_id`,`b_merchant_id`,`order_id`,`expired_time`,`coupon_order_status`,`create_date`,`update_date`,`coupon_price`, `auto_refund`,
`id`,`tenant_id`,`parent_tenant_id`,`coupon_id`,`coupon_type`,`c_user_id`,`owner_id`,`b_user_id`,`b_merchant_id`,`b_tenant_id`,`order_id`,`expired_time`,`coupon_order_status`,`create_date`,`update_date`,`coupon_price`, `auto_refund`,
`verify_type`,`verify_remark`,`pay_vendor`,`pay_version`,`send_merchant_id`,`send_merchant_user_id`,`compose_order_type`,`compose_order_id`,`parent_coupon_order_id`,`coupon_number`,
`freight_price`,`shipping_type`,`shipping_address`,`shipping_status`,`delivery_info`,`subsidy`,`ext_param`
</sql>
@@ -77,6 +78,10 @@
<if test=" null != bMerchantId ">
and `b_merchant_id` = #{bMerchantId}
</if>
<if test=" null != bTenantId ">
and `b_tenant_id` = #{bTenantId}
</if>

<if test=" null != aUserId ">
and `a_user_id` = #{aUserId}
@@ -165,7 +170,7 @@
</select>
<select id="findListOfVerifiedByDateForBUser" parameterType="map" resultMap="BaseResultMap">
select co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.b_merchant_id,co.order_id,co.expired_time,
select co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.b_merchant_id,co.b_tenant_id,co.order_id,co.expired_time,
co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark,co.pay_vendor,co.pay_version,
co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info`,co.ext_param
from wx_coupon_order co
@@ -184,7 +189,7 @@
</select>
<select id="findListOfOrderedByDateForBUser" parameterType="map" resultMap="BaseResultMap">
select co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.b_merchant_id,co.order_id,co.expired_time,
select co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.b_merchant_id,co.b_tenant_id,co.order_id,co.expired_time,
co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark,co.pay_vendor,co.pay_version,
co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info`,co.ext_param
from wx_coupon_order co
@@ -708,7 +713,7 @@
</select>

<select id="findListOfAdmin" parameterType="com.iformall.domain.vo.WxCouponOrderBVo" resultMap="BaseResultMap">
select co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.b_merchant_id,co.expired_time,co.coupon_order_status,co.order_id,
select co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.b_merchant_id,co.b_tenant_id,co.expired_time,co.coupon_order_status,co.order_id,
co.create_date,co.update_date,co.coupon_price, co.verify_type, co.verify_remark,co.pay_vendor,co.pay_version,
co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info`,co.send_merchant_id,co.subsidy,co.ext_param
FROM wx_coupon_order co where co.`tenant_id` = #{tenantId}
@@ -792,7 +797,7 @@
</select>
<select id="findDetailOfAdmin" parameterType="java.util.HashMap" resultMap="BaseResultMap">
select co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.b_merchant_id,
select co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.b_merchant_id,co.b_tenant_id,
co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark, co.pay_vendor,co.pay_version,
co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info`,co.subsidy,co.ext_param
FROM wx_coupon_order co
@@ -802,7 +807,7 @@

<select id="findGoodsList" parameterType="com.iformall.domain.vo.WxCouponOrderBVo" resultMap="BaseResultMap">
select
co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.b_merchant_id,
co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.b_merchant_id,co.b_tenant_id,
co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark, co.pay_vendor,co.pay_version,
co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info`,co.ext_param
FROM wx_coupon_order co
@@ -867,7 +872,7 @@
</select>

<select id="findListOfOrderedByDate" parameterType="map" resultMap="BaseResultMap">
select co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.b_merchant_id,
select co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.b_merchant_id,co.b_tenant_id,
co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark,co.pay_vendor,co.pay_version,
co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info`,co.ext_param
from wx_coupon_order co
@@ -888,7 +893,7 @@
</select>

<select id="findListOfVerifiedByDate" parameterType="map" resultMap="BaseResultMap">
select co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.b_merchant_id,
select co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.b_merchant_id,co.b_tenant_id,
co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark,co.pay_vendor,co.pay_version,
co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info`,co.ext_param
from wx_coupon_order co
@@ -947,7 +952,7 @@

<select id="findDetailOfCUser" parameterType="java.util.HashMap" resultMap="BaseResultMap">
select
co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.b_merchant_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark,co.pay_vendor,
co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.b_merchant_id,co.b_tenant_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark,co.pay_vendor,
co.pay_version,co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info`,co.ext_param
from wx_coupon_order co
where co.id = #{id} and co.tenant_id = #{tenantId}
@@ -955,7 +960,7 @@

<select id="findCouponOrderForPos" parameterType="java.util.Map" resultMap="BaseResultMap">
select
co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.b_merchant_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark,co.pay_vendor,
co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.b_merchant_id,co.b_tenant_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,co.verify_type,co.verify_remark,co.pay_vendor,
co.pay_version,co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info`,co.ext_param
from wx_coupon_order co
where co.c_user_id = #{cUserId}
@@ -1042,7 +1047,7 @@

<select id="findCardDetailOfCUser" parameterType="java.util.HashMap" resultMap="BaseResultMap">
select
co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.b_merchant_id,co.order_id,co.expired_time,co.coupon_order_status,
co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.b_merchant_id,co.b_tenant_id,co.order_id,co.expired_time,co.coupon_order_status,
co.create_date,co.update_date,co.coupon_price
from wx_coupon_order co where co.id = #{id} and co.tenant_id = #{tenantId}
</select>


+ 7
- 1
mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml View File

@@ -7,6 +7,7 @@
<result column="parent_tenant_id" jdbcType="VARCHAR" property="parentTenantId"/>
<result column="out_settle_no" jdbcType="BIGINT" property="outSettleNo" />
<result column="merchant_id" jdbcType="BIGINT" property="merchantId" />
<result column="b_tenant_id" jdbcType="VARCHAR" property="bTenantId" />
<result column="pay_merchant_id" jdbcType="BIGINT" property="payMerchantId" />
<result column="pay_merchant_mch_id" jdbcType="VARCHAR" property="payMerchantMchId" />
<result column="order_id" jdbcType="BIGINT" property="orderId" />
@@ -30,7 +31,7 @@
</resultMap>
<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`out_settle_no`,`merchant_id`,`pay_merchant_id`,`pay_merchant_mch_id`,`order_id`,`pay_vendor`,`pay_version`,`mch_type`,`pay_amount`,
`id`,`tenant_id`,`parent_tenant_id`,`out_settle_no`,`merchant_id`,`b_tenant_id`,`pay_merchant_id`,`pay_merchant_mch_id`,`order_id`,`pay_vendor`,`pay_version`,`mch_type`,`pay_amount`,
`single_order_amount`,`single_order_id`,`pay_time_end`,`pay_time_start`,`transaction_id`,`sharing_order_no`,`type`,`point_deduction`,`receivers`,`error_msg`,`sharing_status`,`update_time`,`create_time`
</sql>

@@ -54,6 +55,10 @@
and `merchant_id` = #{merchantId}
</if>
<if test=" null != bTenantId ">
and `b_tenant_id` = #{bTenantId}
</if>
<if test=" null != payMerchantId ">
and `pay_merchant_id` = #{payMerchantId}
</if>
@@ -153,6 +158,7 @@
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId" />
<result column="parent_tenant_id" jdbcType="VARCHAR" property="parentTenantId"/>
<result column="merchant_id" jdbcType="BIGINT" property="merchantId" />
<result column="b_tenant_id" jdbcType="VARCHAR" property="bTenantId" />
<result column="pay_merchant_id" jdbcType="BIGINT" property="payMerchantId" />
<result column="pay_merchant_mch_id" jdbcType="VARCHAR" property="payMerchantMchId" />
<result column="merchant_name" jdbcType="VARCHAR" property="merchantName" />


+ 6
- 2
mallinkService/src/main/resources/mapper/WxProfitSharingResultMapper.xml View File

@@ -6,6 +6,7 @@
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId" />
<result column="parent_tenant_id" jdbcType="VARCHAR" property="parentTenantId"/>
<result column="merchant_id" jdbcType="BIGINT" property="merchantId" />
<result column="b_tenant_id" jdbcType="VARCHAR" property="bTenantId" />
<result column="sharing_order_id" jdbcType="BIGINT" property="sharingOrderId" />
<result column="sharing_receiver_id" jdbcType="BIGINT" property="sharingReceiverId" />
<result column="pay_amount" jdbcType="INTEGER" property="payAmount" />
@@ -19,7 +20,7 @@
</resultMap>
<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`merchant_id`,`sharing_order_id`,`sharing_receiver_id`,`pay_amount`,`is_private`,`update_time`,`create_time`,`sharing_status`,`finish_time`,`failed_reason`,`description`
`id`,`tenant_id`,`parent_tenant_id`,`merchant_id`,`b_tenant_id`,`sharing_order_id`,`sharing_receiver_id`,`pay_amount`,`is_private`,`update_time`,`create_time`,`sharing_status`,`finish_time`,`failed_reason`,`description`
</sql>

<sql id="dynamicWhereConditions">
@@ -39,7 +40,10 @@

<if test=" null != merchantId ">
and `merchant_id` = #{merchantId}

</if>
<if test=" null != bTenantId ">
and `b_tenant_id` = #{bTenantId}
</if>

<if test=" null != sharingOrderId ">


Loading…
Cancel
Save