| @@ -104,7 +104,8 @@ public class WxCouponOrderController extends BaseController { | |||||
| WxAppinfo appinfoQ = new WxAppinfo(); | WxAppinfo appinfoQ = new WxAppinfo(); | ||||
| appinfoQ.updateTenantInfo(getTenantInfo()); | appinfoQ.updateTenantInfo(getTenantInfo()); | ||||
| appinfoQ.setPlat(EnumPayWay.getEnum(wxCouponOrder.getPayVendor()).getPlat().getCode()); | appinfoQ.setPlat(EnumPayWay.getEnum(wxCouponOrder.getPayVendor()).getPlat().getCode()); | ||||
| appinfoQ.setType(EnumAppType.B.getCode()); | |||||
| // appinfoQ.setType(EnumAppType.B.getCode()); | |||||
| appinfoQ.setType(EnumAppType.C.getCode()); | |||||
| PageInfo<WxAppinfo> appinfoPageInfo = wxAppinfoService.listAsPage(appinfoQ, 1, 1); | PageInfo<WxAppinfo> appinfoPageInfo = wxAppinfoService.listAsPage(appinfoQ, 1, 1); | ||||
| if (appinfoPageInfo.getList().size() > 0) { | if (appinfoPageInfo.getList().size() > 0) { | ||||
| WxAppinfo appinfo = appinfoPageInfo.getList().get(0); | WxAppinfo appinfo = appinfoPageInfo.getList().get(0); | ||||
| @@ -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; | |||||
| @@ -5,8 +5,12 @@ import com.iformall.common.ErrorCode; | |||||
| import com.iformall.common.Result; | import com.iformall.common.Result; | ||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.domain.po.*; | import com.iformall.domain.po.*; | ||||
| import com.iformall.enums.EnumAppType; | |||||
| import com.iformall.enums.EnumPayType; | import com.iformall.enums.EnumPayType; | ||||
| import com.iformall.enums.EnumPayWay; | |||||
| import com.iformall.exception.MallinkException; | import com.iformall.exception.MallinkException; | ||||
| import com.iformall.service.WxAppinfoService; | |||||
| import com.iformall.service.WxCouponOrderService; | |||||
| import com.iformall.service.WxRefundOrderService; | import com.iformall.service.WxRefundOrderService; | ||||
| import io.swagger.annotations.Api; | import io.swagger.annotations.Api; | ||||
| import io.swagger.annotations.ApiImplicitParam; | import io.swagger.annotations.ApiImplicitParam; | ||||
| @@ -26,6 +30,12 @@ import java.util.Map; | |||||
| public class WxRefundOrderController extends BaseController { | public class WxRefundOrderController extends BaseController { | ||||
| private final Logger logger = LoggerFactory.getLogger(this.getClass()); | private final Logger logger = LoggerFactory.getLogger(this.getClass()); | ||||
| @Autowired | |||||
| private WxCouponOrderService wxCouponOrderService; | |||||
| @Autowired | |||||
| private WxAppinfoService wxAppinfoService; | |||||
| @Autowired | @Autowired | ||||
| private WxRefundOrderService wxRefundOrderService; | private WxRefundOrderService wxRefundOrderService; | ||||
| @@ -47,9 +57,21 @@ public class WxRefundOrderController extends BaseController { | |||||
| logger.error("couponOrderId参数不正确: " + paramMap.toString()); | logger.error("couponOrderId参数不正确: " + paramMap.toString()); | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | 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(); | 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 { | try { | ||||
| ResultData rd = wxRefundOrderService.createRefundOrder(appinfo, couponOrderId, EnumPayType.PAY_B_REFUND, bUser.getId()); | ResultData rd = wxRefundOrderService.createRefundOrder(appinfo, couponOrderId, EnumPayType.PAY_B_REFUND, bUser.getId()); | ||||
| return rd; | return rd; | ||||
| @@ -106,7 +106,7 @@ public class WxCUserBasicSignController extends BaseController { | |||||
| WxCUserBasicSign todaySign = wxCUserBasicSignService.getTodaySignIn(wxCUserBasicSign); | WxCUserBasicSign todaySign = wxCUserBasicSignService.getTodaySignIn(wxCUserBasicSign); | ||||
| if(todaySign == null){ | if(todaySign == null){ | ||||
| try { | try { | ||||
| todaySign = wxCUserBasicSignService.signIn(wxCUserBasicSign); | |||||
| todaySign = wxCUserBasicSignService.signIn(getTenantInfo(),wxCUserBasicSign); | |||||
| }catch(Exception e){ | }catch(Exception e){ | ||||
| return new ResultData(ErrorCode.SYS_SERVER_ERROR); | 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(wxCreditHistory.getCreditType().equals(EnumScoreType.SIGN_IN_SEVENDAY.getCode())){ | ||||
| if(continueSign >= 7 && signInSevenDay == 0){ | 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(); | ||||
| } | } | ||||
| return new ResultData(ErrorCode.MEM_MONTH_IS_USED); | return new ResultData(ErrorCode.MEM_MONTH_IS_USED); | ||||
| }else if(wxCreditHistory.getCreditType().equals(EnumScoreType.SIGN_IN_FTDAY.getCode())){ | }else if(wxCreditHistory.getCreditType().equals(EnumScoreType.SIGN_IN_FTDAY.getCode())){ | ||||
| if(continueSign >= 14 && signInFTDay == 0){ | 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(); | ||||
| } | } | ||||
| return new ResultData(ErrorCode.MEM_MONTH_IS_USED); | return new ResultData(ErrorCode.MEM_MONTH_IS_USED); | ||||
| }else if(wxCreditHistory.getCreditType().equals(EnumScoreType.SIGN_IN_TEDAY.getCode())){ | }else if(wxCreditHistory.getCreditType().equals(EnumScoreType.SIGN_IN_TEDAY.getCode())){ | ||||
| if(continueSign >= 28 && signInTEDay == 0){ | 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(); | ||||
| } | } | ||||
| return new ResultData(ErrorCode.MEM_MONTH_IS_USED); | return new ResultData(ErrorCode.MEM_MONTH_IS_USED); | ||||
| @@ -6,7 +6,8 @@ package com.iformall.enums; | |||||
| public enum EnumMerchantSubsidyType { | public enum EnumMerchantSubsidyType { | ||||
| MANUAL(1, "自主结算"), | MANUAL(1, "自主结算"), | ||||
| WECHAT(2, "微信结算"),; | |||||
| WECHAT(2, "微信结算"), | |||||
| DOUYIN(3, "抖音结算"),; | |||||
| public static EnumMerchantSubsidyType getEnum(Integer code) { | public static EnumMerchantSubsidyType getEnum(Integer code) { | ||||
| for (EnumMerchantSubsidyType value : values()) { | for (EnumMerchantSubsidyType value : values()) { | ||||
| @@ -3,6 +3,7 @@ package com.iformall.service; | |||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.domain.po.WxCUserBasicSign; | import com.iformall.domain.po.WxCUserBasicSign; | ||||
| import com.iformall.domain.po.base.TenantEntity; | |||||
| import com.iformall.enums.EnumScoreType; | import com.iformall.enums.EnumScoreType; | ||||
| import java.util.Map; | import java.util.Map; | ||||
| @@ -19,13 +20,13 @@ public interface WxCUserBasicSignService { | |||||
| */ | */ | ||||
| PageInfo<WxCUserBasicSign> listAsPage(WxCUserBasicSign record, Integer pageIndex, Integer pageSize); | PageInfo<WxCUserBasicSign> listAsPage(WxCUserBasicSign record, Integer pageIndex, Integer pageSize); | ||||
| WxCUserBasicSign signIn(WxCUserBasicSign record); | |||||
| WxCUserBasicSign signIn(TenantEntity tenantEntity,WxCUserBasicSign record); | |||||
| WxCUserBasicSign getTodaySignIn(WxCUserBasicSign record); | WxCUserBasicSign getTodaySignIn(WxCUserBasicSign record); | ||||
| Map<String,Integer> getLastSignIn(WxCUserBasicSign record); | Map<String,Integer> getLastSignIn(WxCUserBasicSign record); | ||||
| int signInCreditHistory(WxCUserBasicSign record, EnumScoreType enumScoreType); | |||||
| int signInCreditHistory(TenantEntity tenantEntity, WxCUserBasicSign record, EnumScoreType enumScoreType); | |||||
| ResultData getListStatus(WxCUserBasicSign wxCUserBasicSign); | ResultData getListStatus(WxCUserBasicSign wxCUserBasicSign); | ||||
| } | } | ||||
| @@ -45,4 +45,5 @@ public interface CUserServiceApapter { | |||||
| List<UserCountVo> findCountHistory(WxCUserBasicInfoDto dto, List<TenantEntity> tenantEntitys); | List<UserCountVo> findCountHistory(WxCUserBasicInfoDto dto, List<TenantEntity> tenantEntitys); | ||||
| void actionAfterLogin(CUser user); | |||||
| } | } | ||||
| @@ -245,6 +245,11 @@ public class TtBUserServiceAdapter extends BasicCUserService implements CUserSer | |||||
| return null; | return null; | ||||
| } | } | ||||
| @Override | |||||
| public void actionAfterLogin(CUser user) { | |||||
| } | |||||
| private TtMaService getTtMaService(WxAppinfo wxAppinfo, Boolean isFmOpen) { | private TtMaService getTtMaService(WxAppinfo wxAppinfo, Boolean isFmOpen) { | ||||
| TtMaService ttMaService = maUtil.getTtappService(wxAppinfo); | TtMaService ttMaService = maUtil.getTtappService(wxAppinfo); | ||||
| if (StringUtils.isBlank(wxAppinfo.getAccessToken())) { | if (StringUtils.isBlank(wxAppinfo.getAccessToken())) { | ||||
| @@ -304,6 +304,11 @@ public class TtCUserServiceAdapter extends BasicCUserService implements CUserSer | |||||
| return ttCUserMapper.findCountHistory(tenantEntitys,dto); | return ttCUserMapper.findCountHistory(tenantEntitys,dto); | ||||
| } | } | ||||
| @Override | |||||
| public void actionAfterLogin(CUser user) { | |||||
| super.actionAfterLogin(user); | |||||
| } | |||||
| private TtMaService getTtMaService(WxAppinfo wxAppinfo, Boolean isFmOpen) { | private TtMaService getTtMaService(WxAppinfo wxAppinfo, Boolean isFmOpen) { | ||||
| TtMaService ttMaService = maUtil.getTtappService(wxAppinfo); | TtMaService ttMaService = maUtil.getTtappService(wxAppinfo); | ||||
| if (StringUtils.isBlank(wxAppinfo.getAccessToken())) { | if (StringUtils.isBlank(wxAppinfo.getAccessToken())) { | ||||
| @@ -245,6 +245,11 @@ public class WxBUserServiceAdapter extends BasicCUserService implements CUserSer | |||||
| return null; | return null; | ||||
| } | } | ||||
| @Override | |||||
| public void actionAfterLogin(CUser user) { | |||||
| } | |||||
| private WxMaService getWxMaService(WxAppinfo wxAppinfo, Boolean isFmOpen) { | private WxMaService getWxMaService(WxAppinfo wxAppinfo, Boolean isFmOpen) { | ||||
| WxMaService wxMaService = null; | WxMaService wxMaService = null; | ||||
| if (isFmOpen) { | if (isFmOpen) { | ||||
| @@ -311,6 +311,11 @@ public class WxCUserServiceAdapter extends BasicCUserService implements CUserSer | |||||
| return wxCUserMapper.findCountHistory(tenantEntitys,dto); | return wxCUserMapper.findCountHistory(tenantEntitys,dto); | ||||
| } | } | ||||
| @Override | |||||
| public void actionAfterLogin(CUser user) { | |||||
| super.actionAfterLogin(user); | |||||
| } | |||||
| private WxMaService getWxMaService(WxAppinfo wxAppinfo, Boolean isFmOpen) { | private WxMaService getWxMaService(WxAppinfo wxAppinfo, Boolean isFmOpen) { | ||||
| WxMaService wxMaService = null; | WxMaService wxMaService = null; | ||||
| if (isFmOpen) { | if (isFmOpen) { | ||||
| @@ -6,6 +6,7 @@ import com.iformall.common.IdWorker; | |||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.domain.po.WxCUserBasicSign; | import com.iformall.domain.po.WxCUserBasicSign; | ||||
| import com.iformall.domain.po.WxCreditHistory; | import com.iformall.domain.po.WxCreditHistory; | ||||
| import com.iformall.domain.po.base.TenantEntity; | |||||
| import com.iformall.enums.EnumScoreType; | import com.iformall.enums.EnumScoreType; | ||||
| import com.iformall.enums.EnumUserType; | import com.iformall.enums.EnumUserType; | ||||
| import com.iformall.mapper.WxCUserBasicSignMapper; | import com.iformall.mapper.WxCUserBasicSignMapper; | ||||
| @@ -49,7 +50,7 @@ public class WxCUserBasicSignServiceImpl implements WxCUserBasicSignService { | |||||
| @Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) | @Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) | ||||
| @Override | @Override | ||||
| public WxCUserBasicSign signIn(WxCUserBasicSign record) { | |||||
| public WxCUserBasicSign signIn(TenantEntity tenantEntity,WxCUserBasicSign record) { | |||||
| if(record.getType() == null){ | if(record.getType() == null){ | ||||
| record.setType(WxCUserBasicSign.SIGNIN_TYPE); | record.setType(WxCUserBasicSign.SIGNIN_TYPE); | ||||
| } | } | ||||
| @@ -113,8 +114,8 @@ public class WxCUserBasicSignServiceImpl implements WxCUserBasicSignService { | |||||
| } | } | ||||
| wxCUserBasicSignMapper.insert(record); | 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); | record.setCredit(inCredit + continueIn); | ||||
| return record; | return record; | ||||
| }else{ | }else{ | ||||
| @@ -218,7 +219,7 @@ public class WxCUserBasicSignServiceImpl implements WxCUserBasicSignService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public int signInCreditHistory(WxCUserBasicSign record, EnumScoreType enumScoreType){ | |||||
| public int signInCreditHistory(TenantEntity tenantEntity, WxCUserBasicSign record, EnumScoreType enumScoreType){ | |||||
| WxCreditHistory wxCreditHistory = new WxCreditHistory(); | WxCreditHistory wxCreditHistory = new WxCreditHistory(); | ||||
| wxCreditHistory.setCUserId(record.getUserId()); | wxCreditHistory.setCUserId(record.getUserId()); | ||||
| wxCreditHistory.setTenantId(record.getFinalTenantId()); | wxCreditHistory.setTenantId(record.getFinalTenantId()); | ||||
| @@ -227,7 +228,7 @@ public class WxCUserBasicSignServiceImpl implements WxCUserBasicSignService { | |||||
| wxCreditHistory.setChangePurpose(enumScoreType.getMessage()); | wxCreditHistory.setChangePurpose(enumScoreType.getMessage()); | ||||
| wxCreditHistory.setOperatorType(EnumUserType.CUSERBASIC.getCode()); | wxCreditHistory.setOperatorType(EnumUserType.CUSERBASIC.getCode()); | ||||
| wxCreditHistory.setOperatorId(record.getUserId()); | wxCreditHistory.setOperatorId(record.getUserId()); | ||||
| WxCreditHistory wxCreditHistory1 = wxCreditHistoryService.saveOrUpdate(wxCreditHistory, null); | |||||
| WxCreditHistory wxCreditHistory1 = wxCreditHistoryService.saveOrUpdate(wxCreditHistory, tenantEntity.getTenantId()); | |||||
| if(wxCreditHistory1.getCreditNum() == null){ | if(wxCreditHistory1.getCreditNum() == null){ | ||||
| return 0; | return 0; | ||||
| } | } | ||||
| @@ -250,14 +251,14 @@ public class WxCUserBasicSignServiceImpl implements WxCUserBasicSignService { | |||||
| return new ResultData(list); | return new ResultData(list); | ||||
| } | } | ||||
| private int continueSignInAddCredit(WxCUserBasicSign record){ | |||||
| private int continueSignInAddCredit(TenantEntity tenantEntity, WxCUserBasicSign record){ | |||||
| int i = record.getContinueSign() % 28; | int i = record.getContinueSign() % 28; | ||||
| if(record.getContinueSign() > 0 && i == 0){ | 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){ | }else if(i == 7){ | ||||
| return signInCreditHistory(record,EnumScoreType.SIGN_IN_SEVENDAY); | |||||
| return signInCreditHistory(tenantEntity,record,EnumScoreType.SIGN_IN_SEVENDAY); | |||||
| }else if(i == 14){ | }else if(i == 14){ | ||||
| return signInCreditHistory(record,EnumScoreType.SIGN_IN_FTDAY); | |||||
| return signInCreditHistory(tenantEntity,record,EnumScoreType.SIGN_IN_FTDAY); | |||||
| } | } | ||||
| return 0; | return 0; | ||||
| } | } | ||||
| @@ -186,7 +186,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { | |||||
| break; | break; | ||||
| case ASSIGN_TAGS_TRIGGER_LOGIN: { | case ASSIGN_TAGS_TRIGGER_LOGIN: { | ||||
| WxCUser param = (WxCUser) obj; | |||||
| CUser param = (CUser) obj; | |||||
| WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectById(param.getUserId(),param.getFinalTenantId()); | WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectById(param.getUserId(),param.getFinalTenantId()); | ||||
| if (user != null) { | if (user != null) { | ||||
| @@ -50,7 +50,7 @@ public class FmInsideCLoginMsgServiceImpl implements MsgSendService { | |||||
| logger.error("用户ID未找到: " + cUserId); | logger.error("用户ID未找到: " + cUserId); | ||||
| throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "用户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 | if(wxCUserFrom.getFromType() != null | ||||
| && !(wxCUserFrom.getFromType().equals(EnumCUserFrom.FROM_C_USER.getCode()) && wxCUserFrom.getFromId().equals(user.getId())) | && !(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()))){ | && !(wxCUserFrom.getFromType().equals(EnumCUserFrom.FROM_C_USER_BASIC_INFO.getCode()) && user.getUserId() != null && wxCUserFrom.getFromId().equals(user.getUserId()))){ | ||||
| @@ -4,6 +4,7 @@ import java.util.Map; | |||||
| import java.util.concurrent.ConcurrentHashMap; | import java.util.concurrent.ConcurrentHashMap; | ||||
| import com.iformall.service.pay.service.pay.douyin.miniApp.TtMiniAppPayAdapterService; | 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 com.iformall.service.pay.service.share.douyin.TtPayShareService; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
| @@ -54,6 +55,9 @@ public class PayServiceFactory { | |||||
| @Autowired | @Autowired | ||||
| WxRefundAdapterService wxRefundService; | WxRefundAdapterService wxRefundService; | ||||
| @Autowired | |||||
| TtRefundAdapterService ttRefundService; | |||||
| @Autowired | @Autowired | ||||
| WxCashOutAdapterService WxCashOutService; | WxCashOutAdapterService WxCashOutService; | ||||
| @@ -97,6 +101,7 @@ public class PayServiceFactory { | |||||
| refundMap = new ConcurrentHashMap<Integer, RefundPayAdapterService>(); | refundMap = new ConcurrentHashMap<Integer, RefundPayAdapterService>(); | ||||
| refundMap.put(EnumPayWay.PAY_WAY_WECHAT.getCode(), wxRefundService); | refundMap.put(EnumPayWay.PAY_WAY_WECHAT.getCode(), wxRefundService); | ||||
| refundMap.put(EnumPayWay.PAY_WAY_WECHAT_MA.getCode(), wxRefundService); | refundMap.put(EnumPayWay.PAY_WAY_WECHAT_MA.getCode(), wxRefundService); | ||||
| refundMap.put(EnumPayWay.PAY_WAY_TT.getCode(), ttRefundService); | |||||
| } | } | ||||
| return refundMap; | return refundMap; | ||||
| } | } | ||||
| @@ -25,7 +25,7 @@ public class TtPayShareService extends PayShareBaseAdapterService{ | |||||
| @Override | @Override | ||||
| public Integer getSubsidyType() { | public Integer getSubsidyType() { | ||||
| return EnumMerchantSubsidyType.MANUAL.getCode(); | |||||
| return EnumMerchantSubsidyType.DOUYIN.getCode(); | |||||
| } | } | ||||
| @Override | @Override | ||||