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

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());
+    //查询角色code
-    //        mcsService.verifyWxAuthStatus(mcs);
+    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);
   }
 

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

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：无效

pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/AccountService.java

@@ -223,4 +223,6 @@ public interface AccountService extends IService<Account> {
      * @return 是，即代表可以执行修改操作
      */
     boolean canEditBankCard(String merchantCode);
+
+    boolean checkChannel(Integer channel, Integer userId);
 }

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<AccountMapper, Account> 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<AccountMapper, Account> impl
 
         return statusFlag && flag;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean checkChannel(Integer channel, Integer userId) {
+
+        //更改传入的
+        UpdateWrapper<Account> updateWrapper0 = new UpdateWrapper<>();
+        updateWrapper0.eq("userId", userId)
+                     .eq("channelType", channel==0?"D0":"D1")
+                    .set("valid", 1);
+        boolean update0 = update(updateWrapper0);
+        //更改另一个
+        UpdateWrapper<Account> 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;
+        }
+    }
 }

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<UserPromotion> {
+}

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<UserPromotionMapper, UserPromotion> implements UserPromotionService {
+}