用户状态部分修改

pluss-api-page/src/main/java/cn/pluss/platform/controller/IntroduceController.java

@@ -41,18 +41,19 @@ public class IntroduceController {
         if (Objects.equals(entity.getType(), "1")) {
             String type = httpServletRequest.getHeader("type");
             //TODO 暂时安卓开发IOS不开
-            if ("1".equals(type)){
+            if ("1".equals(type) || "2".equals(type)){
                 return ResultGenerator.genSuccessResult(entity.getContent());
-            }else if ("2".equals(type)){
-                return ResultGenerator.genFailResult("");
             }
+//            else if ("2".equals(type)){
+//                return ResultGenerator.genFailResult("");
+//            }
             return ResultGenerator.genSuccessResult(entity == null ? "" : entity.getContent());
         }else {
             return ResultGenerator.genFailResult("");
         }
     }
     private String image(String typeCode, String merchantType){
-        if ("AG".equals(typeCode)){
+        if ("AG".equals(typeCode) || "FB".equals(typeCode) || "SB".equals(typeCode)){
             return image.PROMOTION_IMAGE.getImageUrl();
         }
         if ("1".equals(merchantType)){
@@ -72,11 +73,11 @@ public class IntroduceController {
         if (Objects.equals(entity.getType(), "1")) {
             String type = httpServletRequest.getHeader("type");
             //TODO 暂时安卓开发IOS不开
-            if ("1".equals(type)){
-                return ResultGenerator.genSuccessResult(image(params.get("typeCode"), params.get("merchantType")));
-            }else if ("2".equals(type)){
-                return ResultGenerator.genFailResult("");
-            }
+            if ("1".equals(type) || "2".equals(type)){
+                return ResultGenerator.genSuccessResult(image(params.get("typeCode"), params.get("merchantType")));}
+//            }else if ("2".equals(type)){
+//                return ResultGenerator.genFailResult("");
+//            }
             return ResultGenerator.genSuccessResult(entity == null ? "" : entity.getContent());
         }else {
             return ResultGenerator.genFailResult("");

pluss-api-page/src/main/java/cn/pluss/platform/controller/UserAppController.java

@@ -15,10 +15,7 @@ import cn.pluss.platform.exception.MsgException;
 import cn.pluss.platform.leshua.*;
 import cn.pluss.platform.leshua.impl.LeshuaMerchantAuditService;
 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.mapper.*;
 import cn.pluss.platform.merchant.AccountService;
 import cn.pluss.platform.merchant.MerchantBaseInfoService;
 import cn.pluss.platform.merchantBankCard.MerchantBankCardService;
@@ -42,6 +39,8 @@ import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.gson.reflect.TypeToken;
 import io.swagger.annotations.*;
+
+import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
@@ -120,6 +119,8 @@ public class UserAppController {
   private MerchantChannelStatusService mcsService;
   @Resource
   private UserPromotionService userPromotionService;
+  @Resource
+  private CashMapper cashMapper;
 
   private static String keyStoreUrl =
     "/home/syb/resources/wechatCert/apiclient_cert.p12"; // 验证证书路径
@@ -382,14 +383,14 @@ public class UserAppController {
     QueryWrapper<UserPromotion> QueryWrapper = new QueryWrapper<>();
     QueryWrapper.eq("user_id", result.getUserId());
     UserPromotion userPromotion = userPromotionService.getOne(QueryWrapper);
+    if (userPromotion== null) {
+      MsgException.checkBlank("", "用户状态异常");
+    }
     result.setTypeCode(userPromotion == null?"null":userPromotion.getTypeCode());
     result.setMinFee(userPromotion == null?"null":userPromotion.getCurrentFee());
 
-    QueryWrapper.clear();
-    QueryWrapper.eq("user_id","244");
-    userPromotion = userPromotionService.getOne(QueryWrapper);
-    result.setMaxFee(userPromotion == null?"null":userPromotion.getCurrentFee());
-
+    result.setMaxFee("0.32");
+    result.setIsExtend(userPromotion.getIsExtend());
     return ResultGenerator.genSuccessResult(result);
   }
 
@@ -552,6 +553,9 @@ public class UserAppController {
     noCashMoney = totalShareMoneyToday;
     allowCashMoney = totalAccumulateShareMoney - cashedMoney - noCashMoney;
 
+    //审核中的提现金额
+    BigDecimal bigDecimal = cashMapper.selectCashAmtTotal(String.valueOf(userId), Cash.STATUS_CHECKING);
+
     Map<String, Object> resultMap = new HashMap<>();
     resultMap.put(
       "totalShareMoneyToday",
@@ -587,6 +591,7 @@ public class UserAppController {
     );
     resultMap.put("noCashMoney", StringUtil.bigDecimal(noCashMoney));
     resultMap.put("cashedMoney", StringUtil.bigDecimal(cashedMoney));
+    resultMap.put("examineMoney", bigDecimal);
     return ResultGenerator.genSuccessResult(resultMap);
   }
 
@@ -1777,7 +1782,7 @@ public class UserAppController {
   public Result<Object> applyMarker(@RequestParam("code") String code){
     UserApp userApp = userAppService.checkApiToken();
     try {
-      userAppService.applyMarker(userApp,code);
+      userAppService.applyMarker(userApp, code);
       return ResultGenerator.genSuccessResult();
     } catch (Exception e) {
       e.printStackTrace();

pluss-api-page/src/main/java/cn/pluss/platform/controller/store/MercAppletController.java

@@ -0,0 +1,40 @@
+package cn.pluss.platform.controller.store;
+
+import cn.pluss.platform.AppletStoreUser.AppletStoreUserService;
+import cn.pluss.platform.api.Result;
+import cn.pluss.platform.api.ResultGenerator;
+import cn.pluss.platform.appletStore.AppletStoreService;
+import cn.pluss.platform.entity.AppletStore;
+import cn.pluss.platform.entity.AppletStoreUser;
+import cn.pluss.platform.vo.AppletStoreVO;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author lyf
+ */
+@RestController
+@RequestMapping("/MercApplet")
+public class MercAppletController {
+    @Resource
+    private AppletStoreService appletStoreService;
+    @Resource
+    private AppletStoreUserService appletStoreUserService;
+
+    @GetMapping("/list")
+    public Result<Object> menuList(Integer userId){
+        List<AppletStoreVO> list = appletStoreService.getList(userId);
+        return ResultGenerator.genSuccessResult(list);
+    }
+
+    @PostMapping("/add")
+    public Result<Object> addStore(@RequestBody AppletStoreUser appletStoreUser){
+        Integer integer = appletStoreUserService.addAppletStoreUser(appletStoreUser);
+        if (integer > 0){
+            return ResultGenerator.genSuccessResult("");
+        }
+        return ResultGenerator.genFailResult("");
+    }
+}