diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/IntroduceController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/IntroduceController.java index 48ea0c2..d931a20 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/IntroduceController.java +++ b/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(""); 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 9f71158..662437d 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 @@ -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 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 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 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(); diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/store/MercAppletController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/store/MercAppletController.java new file mode 100644 index 0000000..d81626a --- /dev/null +++ b/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 menuList(Integer userId){ + List list = appletStoreService.getList(userId); + return ResultGenerator.genSuccessResult(list); + } + + @PostMapping("/add") + public Result addStore(@RequestBody AppletStoreUser appletStoreUser){ + Integer integer = appletStoreUserService.addAppletStoreUser(appletStoreUser); + if (integer > 0){ + return ResultGenerator.genSuccessResult(""); + } + return ResultGenerator.genFailResult(""); + } +} diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/AppletStore.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/AppletStore.java index 0d1f786..fd95c74 100644 --- a/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/AppletStore.java +++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/entity/AppletStore.java @@ -44,4 +44,8 @@ public class AppletStore { *小程序appId */ private String appId; + /** + * 微信版本 0-正式版； 1-测试版； 2-体验版 + */ + private Integer WxType; } 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 7e04580..72c4df4 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 @@ -342,6 +342,9 @@ public class UserApp { @TableField(exist = false) private String minFee; + @TableField(exist = false) + private String isExtend; + // /** // * 有效状态 1：有效 -1：无效 // */ diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/image.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/image.java index 592dc81..9e669b6 100644 --- a/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/image.java +++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/enums/image.java @@ -5,8 +5,7 @@ import lombok.Getter; public enum image { SMALL_IMAGE("小微","https://czg-oss.oss-cn-hangzhou.aliyuncs.com/app/statics/%E5%B0%8F%E5%BE%AE.png",""), PROMOTION_IMAGE("推广","https://czg-oss.oss-cn-hangzhou.aliyuncs.com/app/statics/%E5%95%86%E6%88%B7%E6%8E%A8%E5%B9%BF.png",""), - OTHER_IMAGE("其他","\n" + - "https://czg-oss.oss-cn-hangzhou.aliyuncs.com/app/statics/%E6%99%AE%E9%80%9A%E5%95%86%E6%88%B7%E6%8E%A8%E5%B9%BF.png",""); + OTHER_IMAGE("其他","https://czg-oss.oss-cn-hangzhou.aliyuncs.com/app/statics/%E6%99%AE%E9%80%9A%E5%95%86%E6%88%B7%E6%8E%A8%E5%B9%BF.png",""); /** * 通道值 diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/AppletStoreVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/AppletStoreVO.java index 080c395..08856a1 100644 --- a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/AppletStoreVO.java +++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/AppletStoreVO.java @@ -24,7 +24,7 @@ public class AppletStoreVO { /** * 小程序跳转地址 */ - private String url; + private String path; /** * 用户是否开通 0未开通 1已开通 */ @@ -32,5 +32,13 @@ public class AppletStoreVO { /** *小程序appId */ - private String appId; + private String ghappId; + /** + * 微信版本 0-正式版； 1-测试版； 2-体验版 + */ + private Integer wxType = 0; + /** + * 小程序店铺Id + */ + private Integer appletStoreId; } diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/appletStore/impl/AppletStoreServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/appletStore/impl/AppletStoreServiceImpl.java index 5bdb015..187945e 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/appletStore/impl/AppletStoreServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/appletStore/impl/AppletStoreServiceImpl.java @@ -3,8 +3,12 @@ package cn.pluss.platform.appletStore.impl; import cn.pluss.platform.appletStore.AppletStoreService; import cn.pluss.platform.entity.AppletStore; import cn.pluss.platform.entity.AppletStoreUser; +import cn.pluss.platform.entity.MerchantStore; +import cn.pluss.platform.entity.UserApp; import cn.pluss.platform.mapper.AppletStoreMapper; import cn.pluss.platform.mapper.AppletStoreUserMapper; +import cn.pluss.platform.merchantStore.MerchantStoreService; +import cn.pluss.platform.userApp.UserAppService; import cn.pluss.platform.util.BeanUtils; import cn.pluss.platform.vo.AppletStoreVO; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -26,6 +30,10 @@ public class AppletStoreServiceImpl extends ServiceImpl getList(Integer userId) { @@ -33,24 +41,34 @@ public class AppletStoreServiceImpl extends ServiceImpl appletStores = getBaseMapper().selectList(queryWrapper); + + UserApp userApp = userAppService.queryUserAppByToken(); + userApp.getMerchantCode(); + MerchantStore storeByMerchantCode = merchantStoreService.getStoreByMerchantCode(userApp.getMerchantCode()); + //组装数据 + return menuList(appletStores,userId, storeByMerchantCode.getId()); + } + private List menuList(List appletStores, Integer userId, Integer storeId){ List appletStoreByUser = appletStoreUserMapper.getAppletStoreByUser(userId); - //Map maps = appletStoreByUser.stream().collect(Collectors.toMap(AppletStoreUser::getId, Function.identity())); ArrayList appletStoreVOList = new ArrayList<>(); for (AppletStore appletStore : appletStores) { AppletStoreVO appletStoreVO = new AppletStoreVO(); for (AppletStoreUser value : appletStoreByUser) { if (value.getAppleStoreId().equals(appletStore.getId())){ appletStoreVO.setIsOpen(1); + appletStoreVO.setAppletStoreId(value.getId()); } } if ("餐饮商超".equals(appletStore.getStoreName())){ appletStoreVO.setIsOpen(1); + appletStoreVO.setAppletStoreId(storeId); } appletStoreVO.setId(appletStore.getId()); appletStoreVO.setStoreName(appletStore.getStoreName()); appletStoreVO.setIcon(appletStore.getIcon()); - appletStoreVO.setUrl(appletStore.getUrl()); - appletStoreVO.setAppId(appletStore.getAppId()); + appletStoreVO.setPath(appletStore.getUrl()); + appletStoreVO.setGhappId(appletStore.getAppId()); + appletStoreVO.setWxType(appletStore.getWxType() == null?0:appletStore.getWxType()); appletStoreVOList.add(appletStoreVO); } return appletStoreVOList; diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java index 66f5474..fefdae1 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userApp/impl/UserAppServiceImpl.java @@ -1933,7 +1933,7 @@ public class UserAppServiceImpl extends ServiceImpl impl public void applyMarker(UserApp userApp,String code) throws Exception{ UserInfo userInfo=new UserInfo(); userInfo.setId(userApp.getUserId()); - UserInfo userInfos= userInfoService.queryUserInfo(userInfo); + UserInfo userInfos = userInfoService.queryUserInfo(userInfo); if(ObjectUtil.isEmpty(userInfos)){ MsgException.checkNull(null,"用户信息不存在"); } diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/BaseUserInfoService.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/BaseUserInfoService.java index 57c1e34..436182e 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/BaseUserInfoService.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/BaseUserInfoService.java @@ -1,5 +1,6 @@ package cn.pluss.platform.userInfo.impl; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.crypto.SecureUtil; import cn.jiguang.common.utils.StringUtils; import cn.pluss.platform.channel.MchChannelRateNewService; @@ -114,6 +115,8 @@ public abstract class BaseUserInfoService extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("user_id", checkUserInfo.getId()); + UserPromotion promotion= userPromotionMapper.selectOne(queryWrapper); + if(ObjectUtil.isEmpty(promotion)){ + MsgException.checkNull(null,"用户状态错误"); + } + + if("MG".equals(promotion.getTypeCode())||"FO".equals(promotion.getTypeCode())||"SO".equals(promotion.getTypeCode())){ + MsgException.checkNull(null,"此用户不允许登录"); + } // 原则上不能以原密码进行对比，这里只是给后台登录页面一个方便 if (password.equalsIgnoreCase(checkUserInfo.getPassword())) { UserApp queryUserApp; diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/UserInfoServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/UserInfoServiceImpl.java index 6a3b9e0..169fe6f 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/UserInfoServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/UserInfoServiceImpl.java @@ -76,10 +76,10 @@ public class UserInfoServiceImpl extends BaseUserInfoService { if (Objects.equals(ui.getStatus(), UserInfo.STATUS_NO_SPREAD)) { throw new MsgException("当前推广服务商存在违规行为, 已被关闭推广权限, 请联系收银呗客服申诉"); } - - if (!"1".equals(parentApp.getSpreadFlag())) { - throw new MsgException("该服务商已注册多个账户，该推广码无效"); - } +// +// if (!"1".equals(parentApp.getSpreadFlag())) { +// throw new MsgException("该服务商已注册多个账户，该推广码无效"); +// } } inviteCode = userInfo.getInviteCode(); @@ -156,6 +156,10 @@ public class UserInfoServiceImpl extends BaseUserInfoService { MsgException.checkNull(null,"错误的费率信息"); } } + //如果是普通商户默认费率0.38 + if (userInfo.getTypeCode().equals("MC")){ + promotion.setCurrentFee("0.38"); + } promotion.setIsExtend(userInfo.getTypeCode().equals("MC")?"0":"1"); promotion.setCreateTime(new Date()); diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/UserInfoServiceNewImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/UserInfoServiceNewImpl.java index e3b75d4..c10d6ac 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/UserInfoServiceNewImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userInfo/impl/UserInfoServiceNewImpl.java @@ -132,6 +132,10 @@ public class UserInfoServiceNewImpl extends BaseUserInfoService { MsgException.checkNull(null,"错误的费率信息"); } } + //如果是普通商户默认费率0.38 + if (userInfo.getTypeCode().equals("MC")){ + promotion.setCurrentFee("0.38"); + } promotionNew.setCurrentFee(promotion.getCurrentFee()); promotionNew.setTypeCode(userInfo.getTypeCode()); promotionNew.setIsExtend(userInfo.getTypeCode().equals("MC")?"0":"1"); diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantController.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantController.java index ad6631a..8402c7a 100644 --- a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantController.java +++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantController.java @@ -2517,9 +2517,9 @@ public class MerchantController { throw new MsgException("当前推广服务商存在违规行为, 已被关闭推广权限, 请联系收银呗客服申诉"); } - if (!"1".equals(parentInfo.getSpreadFlag())) { - throw new MsgException("该服务商已注册多个账户，该推广码无效"); - } +// if (!"1".equals(parentInfo.getSpreadFlag())) { +// throw new MsgException("该服务商已注册多个账户，该推广码无效"); +// } UserInfo queryUserInfo = new UserInfo().setLoginName(phone); List existUserInfoList = userInfoMapper.queryUserInfoList(queryUserInfo);