From e26d85f4c95b5f8fd3785814ee904c932d720b0e Mon Sep 17 00:00:00 2001 From: liuyingfang <1357764963@qq.com> Date: Mon, 26 Jun 2023 17:55:45 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E4=BF=A1=E6=81=AF=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9=EF=BC=88=E4=B8=8D=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=EF=BC=89=EF=BC=8C=E5=B9=B6=E4=B8=94=E5=9C=A8=E5=A4=96=E5=B1=82?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=94=A8=E6=88=B7=E9=80=89=E6=8B=A9=E7=9A=84?= =?UTF-8?q?=E8=BF=9B=E4=BB=B6=E6=84=8F=E6=84=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AccountController.java | 14 +++++++++ .../controller/UserAppController.java | 12 ++++++-- .../cn/pluss/platform/entity/Account.java | 5 ++++ .../cn/pluss/platform/entity/UserApp.java | 5 ++++ .../platform/merchant/AccountService.java | 2 ++ .../impl/account/AccountServiceImpl.java | 30 +++++++++++++++++++ .../userPromotion/UserPromotionService.java | 10 +++++++ .../impl/userPromotionServiceImpl.java | 14 +++++++++ 8 files changed, 90 insertions(+), 2 deletions(-) create mode 100644 pluss-service-bundle/src/main/java/cn/pluss/platform/userPromotion/UserPromotionService.java create mode 100644 pluss-service-bundle/src/main/java/cn/pluss/platform/userPromotion/impl/userPromotionServiceImpl.java diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/AccountController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/AccountController.java index 5228849..1001cf0 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/AccountController.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/AccountController.java @@ -105,6 +105,20 @@ public class AccountController { return ResultGenerator.genSuccessResult(result); } + /** + * 用户切换结算方式 + * @return + */ + @PostMapping ("/usercheck") + public Result userCheck(@RequestBody Map params){ + boolean b = accountService.checkChannel(params.get("channel"), params.get("userId")); + if (b){ + return ResultGenerator.genSuccessResult(); + }else { + return ResultGenerator.genFailResult("修改失败 "); + } + } + @GetMapping("/reckoner/v2") public Result reckonerV2(String userId, String merchantType) { StoreSummaryVO result = accountService.getReckonerV2(userId, merchantType); diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java index faab7aa..03f7132 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java @@ -18,6 +18,7 @@ import cn.pluss.platform.level.LevelService; import cn.pluss.platform.mapper.MerchantImageMapper; import cn.pluss.platform.mapper.MerchantOrderMapper; import cn.pluss.platform.mapper.MerchantRateMapper; +import cn.pluss.platform.mapper.UserPromotionMapper; import cn.pluss.platform.merchant.AccountService; import cn.pluss.platform.merchant.MerchantBaseInfoService; import cn.pluss.platform.merchantBankCard.MerchantBankCardService; @@ -30,6 +31,7 @@ import cn.pluss.platform.systemInfo.SystemInfoService; import cn.pluss.platform.user.UserProfitService; import cn.pluss.platform.userApp.UserAppService; import cn.pluss.platform.userInfo.UserInfoService; +import cn.pluss.platform.userPromotion.UserPromotionService; import cn.pluss.platform.util.*; import cn.pluss.platform.vo.*; import cn.pluss.platform.wechat.WechatService; @@ -45,6 +47,7 @@ import java.net.URLEncoder; import java.text.SimpleDateFormat; import java.util.*; import java.util.regex.Pattern; +import javax.annotation.Resource; import javax.validation.Valid; import lombok.RequiredArgsConstructor; import lombok.Setter; @@ -115,6 +118,8 @@ public class UserAppController { @Setter(onMethod_ = { @Autowired, @Lazy }) private MerchantChannelStatusService mcsService; + @Resource + private UserPromotionService userPromotionService; private static String keyStoreUrl = "/home/syb/resources/wechatCert/apiclient_cert.p12"; // 验证证书路径 @@ -373,8 +378,11 @@ public class UserAppController { if (result.getLevelCode() != null) { result.setLevelCode(result.getLevelCode().replace("T", "VIP")); } - // MerchantChannelStatus mcs = mcsService.getValidData(result.getMerchantCode()); - // mcsService.verifyWxAuthStatus(mcs); + //查询角色code + QueryWrapper QueryWrapper = new QueryWrapper<>(); + QueryWrapper.eq("user_id", result.getUserId()); + UserPromotion userPromotion = userPromotionService.getOne(QueryWrapper); + result.setTypeCode(userPromotion==null?"null":userPromotion.getTypeCode()); return ResultGenerator.genSuccessResult(result); } diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Account.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Account.java index 3c921ca..d5ce0ef 100644 --- a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Account.java +++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/Account.java @@ -153,4 +153,9 @@ public class Account implements Serializable { @TableField(updateStrategy = FieldStrategy.IGNORED) private JSONObject bak; + /** + * 权重值 + */ + @TableField(value = "valid") + private Integer valid; } \ No newline at end of file diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserApp.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserApp.java index a60ea8b..bf64561 100644 --- a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserApp.java +++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserApp.java @@ -330,6 +330,11 @@ public class UserApp { */ @TableField("jfShopKey") private String jfShopKey; + /** + * 角色code + */ + @TableField(exist = false) + private String typeCode; // /** // * 有效状态 1：有效 -1：无效 diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/AccountService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/AccountService.java index 54b73cd..bcb28cc 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/AccountService.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/AccountService.java @@ -223,4 +223,6 @@ public interface AccountService extends IService { * @return 是，即代表可以执行修改操作 */ boolean canEditBankCard(String merchantCode); + + boolean checkChannel(Integer channel, Integer userId); } diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/account/AccountServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/account/AccountServiceImpl.java index 506b633..b031fc2 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/account/AccountServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/account/AccountServiceImpl.java @@ -34,6 +34,8 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -562,6 +564,10 @@ public class AccountServiceImpl extends ServiceImpl impl storeSummaryVO.setD1(d1); AccountDTO d0 = getRealAccount(userId, Account.CHANNEL_TYPE_D0); storeSummaryVO.setD0(d0); + //现在只要进件一个通道就是已录入 + if (d1 != null || d0 != null){ + storeSummaryVO.setD0Status("1"); + } MerchantChannelStatus mcsCurrent = mcsService.getValidData(mbi.getMerchantCode()); if (mcsCurrent == null || mcsCurrent.getVirChannelFlag().equals(Account.CHANNEL_TYPE_D1)) { @@ -1363,4 +1369,28 @@ public class AccountServiceImpl extends ServiceImpl impl return statusFlag && flag; } + + @Override + @Transactional(rollbackFor = Exception.class) + public boolean checkChannel(Integer channel, Integer userId) { + + //更改传入的 + UpdateWrapper updateWrapper0 = new UpdateWrapper<>(); + updateWrapper0.eq("userId", userId) + .eq("channelType", channel==0?"D0":"D1") + .set("valid", 1); + boolean update0 = update(updateWrapper0); + //更改另一个 + UpdateWrapper updateWrapper1 = new UpdateWrapper<>(); + updateWrapper1.eq("userId", userId) + .eq("channelType", channel==0?"D1":"D0") + .set("valid", 0); + boolean update1 = update(updateWrapper1); + + if (update0 && update1){ + return true; + }else { + return false; + } + } } diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userPromotion/UserPromotionService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userPromotion/UserPromotionService.java new file mode 100644 index 0000000..2eb00cb --- /dev/null +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userPromotion/UserPromotionService.java @@ -0,0 +1,10 @@ +package cn.pluss.platform.userPromotion; + +import cn.pluss.platform.entity.UserPromotion; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @author lyf + */ +public interface UserPromotionService extends IService { +} diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userPromotion/impl/userPromotionServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userPromotion/impl/userPromotionServiceImpl.java new file mode 100644 index 0000000..dae82f5 --- /dev/null +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userPromotion/impl/userPromotionServiceImpl.java @@ -0,0 +1,14 @@ +package cn.pluss.platform.userPromotion.impl; + + +import cn.pluss.platform.entity.UserProfit; +import cn.pluss.platform.entity.UserPromotion; +import cn.pluss.platform.mapper.UserProfitMapper; +import cn.pluss.platform.mapper.UserPromotionMapper; +import cn.pluss.platform.userPromotion.UserPromotionService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +@Service +public class userPromotionServiceImpl extends ServiceImpl implements UserPromotionService { +}