结算信息逻辑修改（不同步），并且在外层展示用户选择的进件意愿

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<Object> userCheck(@RequestBody Map<String, Integer> 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<Object> reckonerV2(String userId, String merchantType) {
         StoreSummaryVO result = accountService.getReckonerV2(userId, merchantType);

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<UserPromotion> 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);
   }