From 44a4888357f9b793c0c78db710dd5a69ad330b72 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 29 Nov 2021 13:52:42 +0800 Subject: [PATCH 1/7] update refund --- .../market/WxCouponOrderController.java | 3 ++- .../controller/WxRefundOrderController.java | 24 ++++++++++++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java index 43980a21c..dfc73276b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java @@ -104,7 +104,8 @@ public class WxCouponOrderController extends BaseController { WxAppinfo appinfoQ = new WxAppinfo(); appinfoQ.updateTenantInfo(getTenantInfo()); appinfoQ.setPlat(EnumPayWay.getEnum(wxCouponOrder.getPayVendor()).getPlat().getCode()); - appinfoQ.setType(EnumAppType.B.getCode()); +// appinfoQ.setType(EnumAppType.B.getCode()); + appinfoQ.setType(EnumAppType.C.getCode()); PageInfo appinfoPageInfo = wxAppinfoService.listAsPage(appinfoQ, 1, 1); if (appinfoPageInfo.getList().size() > 0) { WxAppinfo appinfo = appinfoPageInfo.getList().get(0); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxRefundOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxRefundOrderController.java index 0eff6b589..a8e5dac8b 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxRefundOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxRefundOrderController.java @@ -5,8 +5,12 @@ import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; +import com.iformall.enums.EnumAppType; import com.iformall.enums.EnumPayType; +import com.iformall.enums.EnumPayWay; import com.iformall.exception.MallinkException; +import com.iformall.service.WxAppinfoService; +import com.iformall.service.WxCouponOrderService; import com.iformall.service.WxRefundOrderService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -26,6 +30,12 @@ import java.util.Map; public class WxRefundOrderController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired + private WxCouponOrderService wxCouponOrderService; + + @Autowired + private WxAppinfoService wxAppinfoService; + @Autowired private WxRefundOrderService wxRefundOrderService; @@ -47,9 +57,21 @@ public class WxRefundOrderController extends BaseController { logger.error("couponOrderId参数不正确: " + paramMap.toString()); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } + WxCouponOrder wxCouponOrder = wxCouponOrderService.getById(couponOrderId,getTenantInfo().getTenantId()); + if (wxCouponOrder == null) { + logger.error("券ID不存在:" + couponOrderId); + throw new MallinkException(ErrorCode.COUPON_ORDER_IS_NULL); + } WxMerchantBUser bUser = getLoginBUser(); - WxAppinfo appinfo = getAppInfo(bUser.getAppId()); + + WxAppinfo appinfo = new WxAppinfo(); + appinfo.updateTenantInfo(getTenantInfo()); + //appinfo.setType(EnumAppType.B.getCode()); + appinfo.setPlat(EnumPayWay.getEnum(wxCouponOrder.getPayVendor()).getPlat().getCode()); + appinfo.setType(EnumAppType.C.getCode()); + appinfo = wxAppinfoService.getList(appinfo).get(0); +// WxAppinfo appinfo = getAppInfo(bUser.getAppId()); try { ResultData rd = wxRefundOrderService.createRefundOrder(appinfo, couponOrderId, EnumPayType.PAY_B_REFUND, bUser.getId()); return rd; From 2d919ac17feab84260f186e2785d8f3f6b769879 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 29 Nov 2021 14:07:09 +0800 Subject: [PATCH 2/7] add menu --- .../resources/db/migration/V2021112900002__addcaidan.sql | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V2021112900002__addcaidan.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V2021112900002__addcaidan.sql b/mallinkAdmin/src/main/resources/db/migration/V2021112900002__addcaidan.sql new file mode 100644 index 000000000..24bf79818 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V2021112900002__addcaidan.sql @@ -0,0 +1,5 @@ + +INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (906, '菜单管理', 904, 'Y', NULL, 1, NULL, NULL, 'menuManage', NULL, 0, 906); + +UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 201, 202, 203, 204, 205, 206, 209, 211, 212, 221, 222, 251, 299, 300, 301, 302, 303, 304, 305, 306, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 614, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 686, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 714, 901, 902, 903, 904, 905, 906, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 60701, 60702]' WHERE `id` = 1; + From b3284af265efb7df84eb0fe241f29252ee272288 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 29 Nov 2021 14:43:34 +0800 Subject: [PATCH 3/7] add pay --- .../java/com/iformall/service/pay/PayServiceFactory.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java b/mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java index 62a32c339..1429e6448 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java @@ -4,6 +4,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import com.iformall.service.pay.service.pay.douyin.miniApp.TtMiniAppPayAdapterService; +import com.iformall.service.pay.service.refund.douyin.TtRefundAdapterService; import com.iformall.service.pay.service.share.douyin.TtPayShareService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -54,6 +55,9 @@ public class PayServiceFactory { @Autowired WxRefundAdapterService wxRefundService; + + @Autowired + TtRefundAdapterService ttRefundService; @Autowired WxCashOutAdapterService WxCashOutService; @@ -97,6 +101,7 @@ public class PayServiceFactory { refundMap = new ConcurrentHashMap(); refundMap.put(EnumPayWay.PAY_WAY_WECHAT.getCode(), wxRefundService); refundMap.put(EnumPayWay.PAY_WAY_WECHAT_MA.getCode(), wxRefundService); + refundMap.put(EnumPayWay.PAY_WAY_TT.getCode(), ttRefundService); } return refundMap; } From c465dc12059beddf277dd465f804b0a37744fa68 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 29 Nov 2021 15:49:39 +0800 Subject: [PATCH 4/7] add SUBSIDY --- .../java/com/iformall/enums/EnumMerchantSubsidyType.java | 3 ++- .../java/com/iformall/service/cuser/CUserServiceApapter.java | 1 + .../com/iformall/service/cuser/tt/TtBUserServiceAdapter.java | 5 +++++ .../com/iformall/service/cuser/tt/TtCUserServiceAdapter.java | 5 +++++ .../com/iformall/service/cuser/wx/WxBUserServiceAdapter.java | 5 +++++ .../com/iformall/service/cuser/wx/WxCUserServiceAdapter.java | 5 +++++ .../service/msg/impl/FmInsideCLoginMsgServiceImpl.java | 2 +- .../service/pay/service/share/douyin/TtPayShareService.java | 2 +- 8 files changed, 25 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMerchantSubsidyType.java b/mallinkService/src/main/java/com/iformall/enums/EnumMerchantSubsidyType.java index 93a723fc8..9c6fdba54 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumMerchantSubsidyType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMerchantSubsidyType.java @@ -6,7 +6,8 @@ package com.iformall.enums; public enum EnumMerchantSubsidyType { MANUAL(1, "自主结算"), - WECHAT(2, "微信结算"),; + WECHAT(2, "微信结算"), + DOUYIN(1, "抖音结算"),; public static EnumMerchantSubsidyType getEnum(Integer code) { for (EnumMerchantSubsidyType value : values()) { diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/CUserServiceApapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/CUserServiceApapter.java index 1ea40849f..8afdc0d2f 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/CUserServiceApapter.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/CUserServiceApapter.java @@ -45,4 +45,5 @@ public interface CUserServiceApapter { List findCountHistory(WxCUserBasicInfoDto dto, List tenantEntitys); + void actionAfterLogin(CUser user); } diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtBUserServiceAdapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtBUserServiceAdapter.java index 3fef32892..7a927d71e 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtBUserServiceAdapter.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtBUserServiceAdapter.java @@ -245,6 +245,11 @@ public class TtBUserServiceAdapter extends BasicCUserService implements CUserSer return null; } + @Override + public void actionAfterLogin(CUser user) { + + } + private TtMaService getTtMaService(WxAppinfo wxAppinfo, Boolean isFmOpen) { TtMaService ttMaService = maUtil.getTtappService(wxAppinfo); if (StringUtils.isBlank(wxAppinfo.getAccessToken())) { diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java index c21914a9c..ca829d55c 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java @@ -304,6 +304,11 @@ public class TtCUserServiceAdapter extends BasicCUserService implements CUserSer return ttCUserMapper.findCountHistory(tenantEntitys,dto); } + @Override + public void actionAfterLogin(CUser user) { + super.actionAfterLogin(user); + } + private TtMaService getTtMaService(WxAppinfo wxAppinfo, Boolean isFmOpen) { TtMaService ttMaService = maUtil.getTtappService(wxAppinfo); if (StringUtils.isBlank(wxAppinfo.getAccessToken())) { diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxBUserServiceAdapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxBUserServiceAdapter.java index 7bb65b7f5..38d15d2b0 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxBUserServiceAdapter.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxBUserServiceAdapter.java @@ -245,6 +245,11 @@ public class WxBUserServiceAdapter extends BasicCUserService implements CUserSer return null; } + @Override + public void actionAfterLogin(CUser user) { + + } + private WxMaService getWxMaService(WxAppinfo wxAppinfo, Boolean isFmOpen) { WxMaService wxMaService = null; if (isFmOpen) { diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java index 75086edc3..b8b6055af 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java @@ -311,6 +311,11 @@ public class WxCUserServiceAdapter extends BasicCUserService implements CUserSer return wxCUserMapper.findCountHistory(tenantEntitys,dto); } + @Override + public void actionAfterLogin(CUser user) { + super.actionAfterLogin(user); + } + private WxMaService getWxMaService(WxAppinfo wxAppinfo, Boolean isFmOpen) { WxMaService wxMaService = null; if (isFmOpen) { diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCLoginMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCLoginMsgServiceImpl.java index 4fdf0e0e2..e490c543d 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCLoginMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCLoginMsgServiceImpl.java @@ -50,7 +50,7 @@ public class FmInsideCLoginMsgServiceImpl implements MsgSendService { logger.error("用户ID未找到: " + cUserId); throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "用户ID未找到" + cUserId); } - basicCUserService.actionAfterLogin(user); + cuserFactory.getCUserService(EnumAppPlat.getByCode(wxCUserFrom.getPlat())).actionAfterLogin(user); if(wxCUserFrom.getFromType() != null && !(wxCUserFrom.getFromType().equals(EnumCUserFrom.FROM_C_USER.getCode()) && wxCUserFrom.getFromId().equals(user.getId())) && !(wxCUserFrom.getFromType().equals(EnumCUserFrom.FROM_C_USER_BASIC_INFO.getCode()) && user.getUserId() != null && wxCUserFrom.getFromId().equals(user.getUserId()))){ diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java index aaab59e41..9fc307c48 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java @@ -25,7 +25,7 @@ public class TtPayShareService extends PayShareBaseAdapterService{ @Override public Integer getSubsidyType() { - return EnumMerchantSubsidyType.MANUAL.getCode(); + return EnumMerchantSubsidyType.DOUYIN.getCode(); } @Override From fd2c83f7d0ead7218ea829710cc51d9236b59cb2 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 29 Nov 2021 16:00:59 +0800 Subject: [PATCH 5/7] add sign --- .../WxCUserBasicSignController.java | 8 ++++---- .../service/WxCUserBasicSignService.java | 5 +++-- .../impl/WxCUserBasicSignServiceImpl.java | 19 ++++++++++--------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCUserBasicSignController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCUserBasicSignController.java index 70c0c5976..f813852c3 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCUserBasicSignController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCUserBasicSignController.java @@ -106,7 +106,7 @@ public class WxCUserBasicSignController extends BaseController { WxCUserBasicSign todaySign = wxCUserBasicSignService.getTodaySignIn(wxCUserBasicSign); if(todaySign == null){ try { - todaySign = wxCUserBasicSignService.signIn(wxCUserBasicSign); + todaySign = wxCUserBasicSignService.signIn(getTenantInfo(),wxCUserBasicSign); }catch(Exception e){ return new ResultData(ErrorCode.SYS_SERVER_ERROR); } @@ -173,19 +173,19 @@ public class WxCUserBasicSignController extends BaseController { if(wxCreditHistory.getCreditType().equals(EnumScoreType.SIGN_IN_SEVENDAY.getCode())){ if(continueSign >= 7 && signInSevenDay == 0){ - wxCUserBasicSignService.signInCreditHistory(wxCUserBasicSign,EnumScoreType.SIGN_IN_SEVENDAY); + wxCUserBasicSignService.signInCreditHistory(getTenantInfo(),wxCUserBasicSign,EnumScoreType.SIGN_IN_SEVENDAY); return new ResultData(); } return new ResultData(ErrorCode.MEM_MONTH_IS_USED); }else if(wxCreditHistory.getCreditType().equals(EnumScoreType.SIGN_IN_FTDAY.getCode())){ if(continueSign >= 14 && signInFTDay == 0){ - wxCUserBasicSignService.signInCreditHistory(wxCUserBasicSign,EnumScoreType.SIGN_IN_FTDAY); + wxCUserBasicSignService.signInCreditHistory(getTenantInfo(),wxCUserBasicSign,EnumScoreType.SIGN_IN_FTDAY); return new ResultData(); } return new ResultData(ErrorCode.MEM_MONTH_IS_USED); }else if(wxCreditHistory.getCreditType().equals(EnumScoreType.SIGN_IN_TEDAY.getCode())){ if(continueSign >= 28 && signInTEDay == 0){ - wxCUserBasicSignService.signInCreditHistory(wxCUserBasicSign,EnumScoreType.SIGN_IN_TEDAY); + wxCUserBasicSignService.signInCreditHistory(getTenantInfo(),wxCUserBasicSign,EnumScoreType.SIGN_IN_TEDAY); return new ResultData(); } return new ResultData(ErrorCode.MEM_MONTH_IS_USED); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicSignService.java b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicSignService.java index 036c10ec1..1073eae17 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicSignService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicSignService.java @@ -3,6 +3,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.WxCUserBasicSign; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumScoreType; import java.util.Map; @@ -19,13 +20,13 @@ public interface WxCUserBasicSignService { */ PageInfo listAsPage(WxCUserBasicSign record, Integer pageIndex, Integer pageSize); - WxCUserBasicSign signIn(WxCUserBasicSign record); + WxCUserBasicSign signIn(TenantEntity tenantEntity,WxCUserBasicSign record); WxCUserBasicSign getTodaySignIn(WxCUserBasicSign record); Map getLastSignIn(WxCUserBasicSign record); - int signInCreditHistory(WxCUserBasicSign record, EnumScoreType enumScoreType); + int signInCreditHistory(TenantEntity tenantEntity, WxCUserBasicSign record, EnumScoreType enumScoreType); ResultData getListStatus(WxCUserBasicSign wxCUserBasicSign); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicSignServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicSignServiceImpl.java index 1e90bb1c1..1ff7d1cb6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicSignServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicSignServiceImpl.java @@ -6,6 +6,7 @@ import com.iformall.common.IdWorker; import com.iformall.common.ResultData; import com.iformall.domain.po.WxCUserBasicSign; import com.iformall.domain.po.WxCreditHistory; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumScoreType; import com.iformall.enums.EnumUserType; import com.iformall.mapper.WxCUserBasicSignMapper; @@ -49,7 +50,7 @@ public class WxCUserBasicSignServiceImpl implements WxCUserBasicSignService { @Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) @Override - public WxCUserBasicSign signIn(WxCUserBasicSign record) { + public WxCUserBasicSign signIn(TenantEntity tenantEntity,WxCUserBasicSign record) { if(record.getType() == null){ record.setType(WxCUserBasicSign.SIGNIN_TYPE); } @@ -113,8 +114,8 @@ public class WxCUserBasicSignServiceImpl implements WxCUserBasicSignService { } wxCUserBasicSignMapper.insert(record); } - int inCredit = signInCreditHistory(record, EnumScoreType.SIGN_IN_DAY); - int continueIn = continueSignInAddCredit(record); + int inCredit = signInCreditHistory(tenantEntity,record, EnumScoreType.SIGN_IN_DAY); + int continueIn = continueSignInAddCredit(tenantEntity,record); record.setCredit(inCredit + continueIn); return record; }else{ @@ -218,7 +219,7 @@ public class WxCUserBasicSignServiceImpl implements WxCUserBasicSignService { } @Override - public int signInCreditHistory(WxCUserBasicSign record, EnumScoreType enumScoreType){ + public int signInCreditHistory(TenantEntity tenantEntity, WxCUserBasicSign record, EnumScoreType enumScoreType){ WxCreditHistory wxCreditHistory = new WxCreditHistory(); wxCreditHistory.setCUserId(record.getUserId()); wxCreditHistory.setTenantId(record.getFinalTenantId()); @@ -227,7 +228,7 @@ public class WxCUserBasicSignServiceImpl implements WxCUserBasicSignService { wxCreditHistory.setChangePurpose(enumScoreType.getMessage()); wxCreditHistory.setOperatorType(EnumUserType.CUSERBASIC.getCode()); wxCreditHistory.setOperatorId(record.getUserId()); - WxCreditHistory wxCreditHistory1 = wxCreditHistoryService.saveOrUpdate(wxCreditHistory, null); + WxCreditHistory wxCreditHistory1 = wxCreditHistoryService.saveOrUpdate(wxCreditHistory, tenantEntity.getTenantId()); if(wxCreditHistory1.getCreditNum() == null){ return 0; } @@ -250,14 +251,14 @@ public class WxCUserBasicSignServiceImpl implements WxCUserBasicSignService { return new ResultData(list); } - private int continueSignInAddCredit(WxCUserBasicSign record){ + private int continueSignInAddCredit(TenantEntity tenantEntity, WxCUserBasicSign record){ int i = record.getContinueSign() % 28; if(record.getContinueSign() > 0 && i == 0){ - return signInCreditHistory(record, EnumScoreType.SIGN_IN_TEDAY); + return signInCreditHistory(tenantEntity,record, EnumScoreType.SIGN_IN_TEDAY); }else if(i == 7){ - return signInCreditHistory(record,EnumScoreType.SIGN_IN_SEVENDAY); + return signInCreditHistory(tenantEntity,record,EnumScoreType.SIGN_IN_SEVENDAY); }else if(i == 14){ - return signInCreditHistory(record,EnumScoreType.SIGN_IN_FTDAY); + return signInCreditHistory(tenantEntity,record,EnumScoreType.SIGN_IN_FTDAY); } return 0; } From d358766001493352b107b35d891b2b64d53a895a Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 29 Nov 2021 16:15:08 +0800 Subject: [PATCH 6/7] add douyin --- .../main/java/com/iformall/enums/EnumMerchantSubsidyType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMerchantSubsidyType.java b/mallinkService/src/main/java/com/iformall/enums/EnumMerchantSubsidyType.java index 9c6fdba54..1993d9820 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumMerchantSubsidyType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMerchantSubsidyType.java @@ -7,7 +7,7 @@ public enum EnumMerchantSubsidyType { MANUAL(1, "自主结算"), WECHAT(2, "微信结算"), - DOUYIN(1, "抖音结算"),; + DOUYIN(3, "抖音结算"),; public static EnumMerchantSubsidyType getEnum(Integer code) { for (EnumMerchantSubsidyType value : values()) { From 824e0aafe166f71dd5621dd475b702140438dbd3 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 29 Nov 2021 16:23:08 +0800 Subject: [PATCH 7/7] update login user --- .../java/com/iformall/service/impl/WxCUserTagsServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java index b6469fdad..846bee7a8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java @@ -186,7 +186,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { break; case ASSIGN_TAGS_TRIGGER_LOGIN: { - WxCUser param = (WxCUser) obj; + CUser param = (CUser) obj; WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectById(param.getUserId(),param.getFinalTenantId()); if (user != null) {