代码删简

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/goods/GoodsController.java

@@ -165,18 +165,6 @@ public class GoodsController {
         return ResponseHelper.success(detail);
     }
 
-//    @GetMapping("/qrcode")
-//    @ApiOperation("获取商品二维码")
-//    public ResponseHelper<String> qrcode(
-//            @ApiParam(value = "用户id",required = true) @RequestParam String userId,
-//            @ApiParam(value = "商品id",required = true) @RequestParam String goodsId,
-//            HttpServletRequest request
-//    ) throws IOException, RemoteServiceException {
-//        UserWxBean userWxBean = userLogic.userDetail(userId,request);
-//        String qrcode = wechatLogic.getQrcode(QrCodeEnum.GOODS.toString().toLowerCase(),goodsId,userId,userWxBean.getCompanyWechatId());
-//        return ResponseHelper.success(qrcode);
-//    }
-
     @GetMapping("/qrcode")
     @ApiOperation("获取商品二维码")
     public ResponseHelper<String> qrcode(
@@ -191,32 +179,4 @@ public class GoodsController {
         return ResponseHelper.success(ossUtil.getAccessUrl() + filePath);
     }
 
-
-
-    @GetMapping("/promotion/group/list")
-    @ApiOperation("团购商品列表")
-    public ResponseHelper<IPage<PromotionGoodsBean>> grouplist(
-            @ApiParam(value = "用户id",required = true) @RequestParam String userId,
-            @ApiParam(value = "商品类型id",required = false) @RequestParam(required = false) String goodsCategoryId,
-            @ApiParam(value = "搜索内容",required = false) @RequestParam(required = false) String keyword,
-            @ApiParam(value = "页号",required = true) @RequestParam(required = true) Integer pageNo,
-            @ApiParam(value = "页大小",required = true) @RequestParam(required = true) Integer pageSize,
-            HttpServletRequest request
-    ) throws IOException, RemoteServiceException {
-        IPage<PromotionGoodsBean> promotionGoodsBeanIPage = goodsLogic.myGroupGoods(userId, goodsCategoryId,keyword, pageNo, pageSize,request);
-        return ResponseHelper.success(promotionGoodsBeanIPage);
-    }
-
-    @GetMapping("/promotion/share/qrcode")
-    @ApiOperation("团购活动分享二维码")
-    public ResponseHelper<PromotionShareQrCode> shareQrcode(
-            @ApiParam(value = "用户id",required = true) @RequestParam String userId,
-            HttpServletRequest request
-    ) throws IOException {
-        PromotionShareQrCode promotionShareQrCode = goodsLogic.queryShareQrcode(userId,request);
-        return ResponseHelper.success(promotionShareQrCode);
-    }
-
-
-
 }

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/order/LeaseOrderController.java

@@ -1,114 +0,0 @@
-package com.gree.mall.miniapp.controller.order;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.miniapp.bean.PayDetail;
-import com.gree.mall.miniapp.bean.order.LeaseOrderBean;
-import com.gree.mall.miniapp.bean.order.LeaseOrderVO;
-import com.gree.mall.miniapp.bean.user.CurrentCompanyWechat;
-import com.gree.mall.miniapp.constant.Constant;
-import com.gree.mall.miniapp.exception.RemoteServiceException;
-import com.gree.mall.miniapp.helper.ResponseHelper;
-import com.gree.mall.miniapp.logic.common.CommonLogic;
-import com.gree.mall.miniapp.logic.order.LeaseOrderLogic;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.integration.redis.util.RedisLockRegistry;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-
-@Slf4j
-@RestController
-@Api(value = "租赁订单列表", tags ={"租赁订单列表"} )
-@RequestMapping(value = "/lease/order", produces = "application/json; charset=utf-8")
-public class LeaseOrderController {
-
-    @Resource
-    LeaseOrderLogic leaseOrderLogic;
-    @Resource
-    RedisLockRegistry redisLockRegistry;
-    @Resource
-    CommonLogic commonLogic;
-
-    @PostMapping("/add")
-    @ApiOperation(value = "提交订单")
-    public ResponseHelper<String> add(
-            @RequestBody LeaseOrderBean bean
-    ) throws Exception {
-        final CurrentCompanyWechat wechat = commonLogic.getCurrentCompanyWechat();
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LEASE_ORDER_LOCK + ":" + wechat.getUserId());
-        if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("系统繁忙，请稍后再尝试");
-        }
-        try {
-            String id = leaseOrderLogic.add(bean);
-
-            return ResponseHelper.success(id);
-        } finally {
-            obtain.unlock();
-        }
-
-    }
-
-    @PostMapping("/list/page")
-    @ApiOperation(value = "订单列表")
-    public ResponseHelper<IPage<LeaseOrderVO>> page(
-            @ApiParam(value = "关键词") @RequestParam(required = false) String keyword,
-            @ApiParam(value = "支付状态 true=已支付 false=未支付") @RequestParam(required = false) Boolean payStatus,
-            @ApiParam(value = "订单状态 WAIT=待确认 WAIT_START=待开始 LEASE=租赁中 OVER=已到期，待回收 RECOVER=已到期，已回收 CANCEL=已取消") @RequestParam(required = false) String status,
-            @ApiParam(value = "页号",required = true) @RequestParam Integer pageNum,
-            @ApiParam(value = "页大小",required = true) @RequestParam Integer pageSize
-    ) throws Exception {
-        IPage<LeaseOrderVO> page = leaseOrderLogic.page(keyword, payStatus, status, pageNum, pageSize);
-        return ResponseHelper.success(page);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "详情")
-    public ResponseHelper<LeaseOrderBean> detail(
-            @ApiParam(value = "单据编号",required = true) @RequestParam String id
-    ) throws Exception {
-        LeaseOrderBean bean = leaseOrderLogic.detail(id);
-        return ResponseHelper.success(bean);
-    }
-
-    @PostMapping("/pay")
-    @ApiOperation(value = "支付")
-    public ResponseHelper<PayDetail> pay(
-            HttpServletRequest request,
-            @ApiParam(value = "单据编号",required = true) @RequestParam String id,
-            @ApiParam(value = "是否小程序兼容") @RequestParam (required = false) Boolean miniPay,
-            @ApiParam(value = "openId") @RequestParam(required = false) String openId,
-            @ApiParam(value = "续租结束日期") @RequestParam(required = false) Date endDate,
-            @ApiParam(value = "备注") @RequestParam(required = false) String remark
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LEASE_ORDER_LOCK + ":" + id);
-        if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("系统繁忙，请稍后再尝试");
-        }
-        try {
-            PayDetail detail = leaseOrderLogic.pay(request, id, miniPay, openId, endDate, remark);
-            return ResponseHelper.success(detail);
-        } finally {
-            obtain.unlock();
-        }
-    }
-
-    @PostMapping("/compute/renewal/amount")
-    @ApiOperation(value = "计算续租金额")
-    public ResponseHelper<BigDecimal> computeRenewalAmount(
-            @ApiParam(value = "单据编号",required = true) @RequestParam String id,
-            @ApiParam(value = "续租结束日期") @RequestParam(required = false) Date endDate
-    ) throws Exception {
-        BigDecimal amount = leaseOrderLogic.computeRenewalAmount(id, endDate);
-        return ResponseHelper.success(amount);
-    }
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/user/UserController.java

@@ -50,17 +50,6 @@ public class UserController {
     CommonLogic commonLogic;
 
 
-    @PostMapping("/bind")
-    @ApiOperation(value = "绑定业务员")
-    public ResponseHelper grantMobile(
-            @ApiParam(required = true, value = "用户id") @RequestParam(required = true) String userId,
-            @ApiParam(required = false, value = "业务员用户id") @RequestParam(required = false) String serviceId,
-            @ApiParam(required = false, value = "业务员openId") @RequestParam(required = false) String serviceOpenId
-    ) throws Exception {
-        userLogic.bind(userId,serviceId,serviceOpenId);
-        return ResponseHelper.success();
-    }
-
     @GetMapping("/qrcode/bind")
     @ApiOperation(value = "获取业务员绑定小程序码")
     public ResponseHelper bindQrCode(HttpServletRequest request) throws Exception {
@@ -206,36 +195,6 @@ public class UserController {
         return ResponseHelper.success(bigDecimal);
     }
 
-    @GetMapping("/customer")
-    @ApiOperation(value = "我的客户列表")
-    public ResponseHelper<Page<User>> customerList(
-            @ApiParam(required = true, value = "用户id") @RequestParam(required = true) String userId,
-            @ApiParam(required = true, value = "pageNum") @RequestParam(required = true) Integer pageNum,
-            @ApiParam(required = true, value = "pageSize") @RequestParam(required = true)Integer pageSize
-    ) throws RemoteServiceException {
-        IPage<User> userIPage = userLogic.customerList(userId, pageNum, pageSize);
-        return ResponseHelper.success(userIPage);
-    }
-
-
-    @GetMapping("/parent")
-    @ApiOperation(value = "我的客户经理")
-    public ResponseHelper<User> parentList(
-            @ApiParam(required = true, value = "用户id") @RequestParam(required = true) String userId
-    ) throws RemoteServiceException {
-        User user = userLogic.parentUser(userId);
-        return ResponseHelper.success(user);
-    }
-
-    @PostMapping("/default/websit")
-    @ApiOperation(value = "设置默认网点")
-    public ResponseHelper defaultWebsit(
-            @ApiParam(required = true,value="默认网点id") @RequestParam String websitId
-    ){
-        userLogic.defaultWebsit(websitId);
-        return ResponseHelper.success();
-    }
-
     @GetMapping("/my/count")
     @ApiOperation(value = "我的相关统计")
     public ResponseHelper<MyCountBean> myCount(
@@ -265,7 +224,7 @@ public class UserController {
             @ApiParam(value = "滑动验证数值",required = false) @RequestParam(required = false) String vrifyCode
     ) throws Exception {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
-        Integer count = userService.lambdaQuery().eq(User::getMobile, phone).eq(User::getCompanyWechatId, currentCompanyWechat.getCompanyWechatId()).count();
+        Integer count = userService.lambdaQuery().eq(User::getMobile, phone).count();
         if(count > 0){
             throw new RemoteServiceException("手机号已被绑定，请勿重复绑定");
         }
@@ -299,26 +258,27 @@ public class UserController {
     ){
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
         String miniOpenId = commonLogic.getMiniOpenId();
-        userService.lambdaUpdate().set(User::getMiniOpenId,miniOpenId).eq(User::getUserId,currentCompanyWechat.getUserId()).update();
         return ResponseHelper.success();
     }
 
     @PostMapping("/my/settle")
     @ApiOperation("我的安维费")
     public ResponseHelper<IPage<SettleMonthWagesWorkerBean>> mySettle(
+            @ApiParam(required = true, value = "companyWechatId") @RequestParam String companyWechatId,
             @ApiParam(required = true, value = "pageNum") @RequestParam Integer pageNum,
             @ApiParam(required = true, value = "pageSize") @RequestParam Integer pageSize
     ){
-        IPage<SettleMonthWagesWorkerBean> page = userLogic.mySettle(pageNum, pageSize);
+        IPage<SettleMonthWagesWorkerBean> page = userLogic.mySettle(companyWechatId, pageNum, pageSize);
         return ResponseHelper.success(page);
     }
 
     @PostMapping("/my/settle/item")
     @ApiOperation("费用明细")
     public ResponseHelper<List<SettleExpenseItem>> mySettleItem(
+            @ApiParam(required = true, value = "companyWechatId") @RequestParam String companyWechatId,
             @ApiParam(required = true, value = "月度工资汇总id") @RequestParam String settleMonthWagesId
     ){
-        List<SettleExpenseItem> list = userLogic.mySettleItem(settleMonthWagesId);
+        List<SettleExpenseItem> list = userLogic.mySettleItem(companyWechatId, settleMonthWagesId);
         return ResponseHelper.success(list);
     }
 

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/acitivy/PromotionLuckDrawLogic.java

@@ -44,62 +44,62 @@ public class PromotionLuckDrawLogic {
      */
     @Transactional
     public PromotionLuckDrawExchangeDetail exchange(String code, HttpServletRequest request){
-
-        String userCouponId = "draw"+IdWorker.getIdStr();
-
-        CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat(request);
-        User user = currentCompanyWechat.getUser();
-        if(user.getExchangeNum() >= 10){
-            throw new RemoteServiceException("您错误兑换次数已超上限，已被禁止兑换");
-        }
-        PromotionLuckDrawCouponCode promotionLuckDrawCouponCode = promotionLuckDrawCouponCodeService.lambdaQuery().eq(PromotionLuckDrawCouponCode::getCode, code).one();
-        if(promotionLuckDrawCouponCode == null){
-           user.setExchangeNum(user.getExchangeNum() + 1);
-           user.updateById();
-           throw new RemoteServiceException("兑换码错误，请重新兑换");
-        }
-        long curTime = new Date().getTime();
-        if(promotionLuckDrawCouponCode.getEndTime().getTime() < curTime || promotionLuckDrawCouponCode.getStartTime().getTime() > curTime
-                || promotionLuckDrawCouponCode.getStatus()){
-            throw new RemoteServiceException("兑换码无效");
-        }
-        //本次活动
-        PromotionLuckDraw promotionLuckDraw = promotionLuckDrawService.getById(promotionLuckDrawCouponCode.getPromotionLuckDrawId());
-        if(promotionLuckDraw == null || !promotionLuckDraw.getStatus() || promotionLuckDraw.getStartTime().getTime() > curTime
-                || promotionLuckDraw.getEndTime().getTime() < curTime){
-            throw new RemoteServiceException("本次活动已取消");
-        }
-        //兑换成功
-        promotionLuckDrawCouponCode.setUserNickName(user.getNickName());
-        promotionLuckDrawCouponCode.setUserId(user.getUserId());
-        promotionLuckDrawCouponCode.setUserMobile(user.getMobile());
-        promotionLuckDrawCouponCode.setUserExchangeTime(new Date());
-        promotionLuckDrawCouponCode.setStatus(true);
-        promotionLuckDrawCouponCode.setUserCouponId(userCouponId);
-        promotionLuckDrawCouponCode.updateById();
-
-        //发放优惠券
-        PromotionLuckDrawCoupon promotionLuckDrawCoupon = promotionLuckDrawCouponService.getById(promotionLuckDrawCouponCode.getPromotionLuckDrawCouponId());
-        if(promotionLuckDrawCoupon == null){
-            throw new RemoteServiceException("兑换失败");
-        }
-        UserCoupon userCoupon = new UserCoupon();
-        userCoupon.setId(userCouponId);
-        userCoupon.setUserId(currentCompanyWechat.getUserId());
-        userCoupon.setCouponId(promotionLuckDrawCoupon.getId());
-        userCoupon.setCouponName(promotionLuckDrawCoupon.getCouponName());
-        userCoupon.setCouponValue(promotionLuckDrawCoupon.getDiscountAmount());
-        userCoupon.setCouponType(promotionLuckDrawCoupon.getCouponType());
-        userCoupon.setReceiveTime(new Date());
-        userCoupon.setActiveStartTime(promotionLuckDraw.getCouponStartTime());
-        userCoupon.setActiveEndTime(promotionLuckDraw.getCouponEndTime());
-        userCoupon.setOrderAmount(promotionLuckDrawCoupon.getOrderLimitAmount());
-        userCoupon.setReceivePlatform("抽奖活动兑换");
-        userCoupon.setTransferType(false);
-        userCoupon.setLeftShareTimes(0);
-        userCoupon.setCompanyWechatId(currentCompanyWechat.getCompanyWechatId());
-        userCoupon.setCompanyName(currentCompanyWechat.getCompanyName());
-        userCoupon.insert();
+//
+//        String userCouponId = "draw"+IdWorker.getIdStr();
+//
+//        CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat(request);
+//        User user = currentCompanyWechat.getUser();
+//        if(user.getExchangeNum() >= 10){
+//            throw new RemoteServiceException("您错误兑换次数已超上限，已被禁止兑换");
+//        }
+//        PromotionLuckDrawCouponCode promotionLuckDrawCouponCode = promotionLuckDrawCouponCodeService.lambdaQuery().eq(PromotionLuckDrawCouponCode::getCode, code).one();
+//        if(promotionLuckDrawCouponCode == null){
+//           user.setExchangeNum(user.getExchangeNum() + 1);
+//           user.updateById();
+//           throw new RemoteServiceException("兑换码错误，请重新兑换");
+//        }
+//        long curTime = new Date().getTime();
+//        if(promotionLuckDrawCouponCode.getEndTime().getTime() < curTime || promotionLuckDrawCouponCode.getStartTime().getTime() > curTime
+//                || promotionLuckDrawCouponCode.getStatus()){
+//            throw new RemoteServiceException("兑换码无效");
+//        }
+//        //本次活动
+//        PromotionLuckDraw promotionLuckDraw = promotionLuckDrawService.getById(promotionLuckDrawCouponCode.getPromotionLuckDrawId());
+//        if(promotionLuckDraw == null || !promotionLuckDraw.getStatus() || promotionLuckDraw.getStartTime().getTime() > curTime
+//                || promotionLuckDraw.getEndTime().getTime() < curTime){
+//            throw new RemoteServiceException("本次活动已取消");
+//        }
+//        //兑换成功
+//        promotionLuckDrawCouponCode.setUserNickName(user.getNickName());
+//        promotionLuckDrawCouponCode.setUserId(user.getUserId());
+//        promotionLuckDrawCouponCode.setUserMobile(user.getMobile());
+//        promotionLuckDrawCouponCode.setUserExchangeTime(new Date());
+//        promotionLuckDrawCouponCode.setStatus(true);
+//        promotionLuckDrawCouponCode.setUserCouponId(userCouponId);
+//        promotionLuckDrawCouponCode.updateById();
+//
+//        //发放优惠券
+//        PromotionLuckDrawCoupon promotionLuckDrawCoupon = promotionLuckDrawCouponService.getById(promotionLuckDrawCouponCode.getPromotionLuckDrawCouponId());
+//        if(promotionLuckDrawCoupon == null){
+//            throw new RemoteServiceException("兑换失败");
+//        }
+//        UserCoupon userCoupon = new UserCoupon();
+//        userCoupon.setId(userCouponId);
+//        userCoupon.setUserId(currentCompanyWechat.getUserId());
+//        userCoupon.setCouponId(promotionLuckDrawCoupon.getId());
+//        userCoupon.setCouponName(promotionLuckDrawCoupon.getCouponName());
+//        userCoupon.setCouponValue(promotionLuckDrawCoupon.getDiscountAmount());
+//        userCoupon.setCouponType(promotionLuckDrawCoupon.getCouponType());
+//        userCoupon.setReceiveTime(new Date());
+//        userCoupon.setActiveStartTime(promotionLuckDraw.getCouponStartTime());
+//        userCoupon.setActiveEndTime(promotionLuckDraw.getCouponEndTime());
+//        userCoupon.setOrderAmount(promotionLuckDrawCoupon.getOrderLimitAmount());
+//        userCoupon.setReceivePlatform("抽奖活动兑换");
+//        userCoupon.setTransferType(false);
+//        userCoupon.setLeftShareTimes(0);
+//        userCoupon.setCompanyWechatId(currentCompanyWechat.getCompanyWechatId());
+//        userCoupon.setCompanyName(currentCompanyWechat.getCompanyName());
+//        userCoupon.insert();
 
         return this.detail(code);
     }

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/common/EventLogic.java

@@ -36,64 +36,64 @@ public class EventLogic {
      * @throws Exception
      */
     public void scanBringQrcode(Map<String, String> params,String appid) throws Exception {
-        String eventKey = params.get("EventKey");
-        String mpOpenId = params.get("FromUserName");
-
-        if (eventKey.contains("qrscene_")) {
-            eventKey = eventKey.replace("qrscene_", "");
-        }
-
-        User workerUser = userService.lambdaQuery()
-                .eq(User::getUserId, eventKey)
-                .last("limit 1")
-                .one();
-
-        if (Objects.isNull(workerUser)) {
-            log.error("扫二维码关注公众号未找到师傅userId: " + eventKey);
-            return;
-        }
-
-        String key = Constant.RedisPrefix.LOCK_AUTH + ":" + mpOpenId;
-        Lock obtain = redisLockRegistry.obtain(key);
-        if (!obtain.tryLock(2, TimeUnit.SECONDS)) {
-            log.error("添加user锁失败, 师傅userId: " + eventKey + ", 用户openid: " + mpOpenId);
-            return;
-        }
-
-        try {
-            //如果用户不存在则新注册
-            User user = userService.lambdaQuery()
-                    .eq(User::getMpOpenId, mpOpenId)
-                    .eq(User::getCompanyWechatId, workerUser.getCompanyWechatId())
-                    .one();
-            if (user == null) {
-                user = new User();
-                user.setUserId(IdWorker.getIdStr())
-                        .setNickName("微信用户_" + RandomUtil.randomNumbers(4))
-                        .setLastLoginTime(new Date())
-                        .setOpenId(mpOpenId)
-                        .setMpOpenId(mpOpenId)
-                        .setFirstServiceId(workerUser.getUserId())
-                        .setFirstServiceTime(new Date())
-                        .setServiceId(workerUser.getUserId())
-                        .setLastLoginTime(new Date())
-                        .setCreateTime(new Date())
-                        .setCompanyWechatId(workerUser.getCompanyWechatId())
-                        .setCompanyName(workerUser.getCompanyName())
-                        .insert();
-            } else {
-                if (StringUtils.isBlank(user.getFirstServiceId())) {
-                    user.setFirstServiceId(workerUser.getUserId())
-                            .setFirstServiceTime(new Date())
-                            .setServiceId(workerUser.getUserId())
-                            .setServiceTime(new Date())
-                            .setIsExchangeCode(true)
-                            .updateById();
-                }
-            }
-        }finally {
-            obtain.unlock();
-        }
+//        String eventKey = params.get("EventKey");
+//        String mpOpenId = params.get("FromUserName");
+//
+//        if (eventKey.contains("qrscene_")) {
+//            eventKey = eventKey.replace("qrscene_", "");
+//        }
+//
+//        User workerUser = userService.lambdaQuery()
+//                .eq(User::getUserId, eventKey)
+//                .last("limit 1")
+//                .one();
+//
+//        if (Objects.isNull(workerUser)) {
+//            log.error("扫二维码关注公众号未找到师傅userId: " + eventKey);
+//            return;
+//        }
+//
+//        String key = Constant.RedisPrefix.LOCK_AUTH + ":" + mpOpenId;
+//        Lock obtain = redisLockRegistry.obtain(key);
+//        if (!obtain.tryLock(2, TimeUnit.SECONDS)) {
+//            log.error("添加user锁失败, 师傅userId: " + eventKey + ", 用户openid: " + mpOpenId);
+//            return;
+//        }
+//
+//        try {
+//            //如果用户不存在则新注册
+//            User user = userService.lambdaQuery()
+//                    .eq(User::getMpOpenId, mpOpenId)
+//                    .eq(User::getCompanyWechatId, workerUser.getCompanyWechatId())
+//                    .one();
+//            if (user == null) {
+//                user = new User();
+//                user.setUserId(IdWorker.getIdStr())
+//                        .setNickName("微信用户_" + RandomUtil.randomNumbers(4))
+//                        .setLastLoginTime(new Date())
+//                        .setOpenId(mpOpenId)
+//                        .setMpOpenId(mpOpenId)
+//                        .setFirstServiceId(workerUser.getUserId())
+//                        .setFirstServiceTime(new Date())
+//                        .setServiceId(workerUser.getUserId())
+//                        .setLastLoginTime(new Date())
+//                        .setCreateTime(new Date())
+//                        .setCompanyWechatId(workerUser.getCompanyWechatId())
+//                        .setCompanyName(workerUser.getCompanyName())
+//                        .insert();
+//            } else {
+//                if (StringUtils.isBlank(user.getFirstServiceId())) {
+//                    user.setFirstServiceId(workerUser.getUserId())
+//                            .setFirstServiceTime(new Date())
+//                            .setServiceId(workerUser.getUserId())
+//                            .setServiceTime(new Date())
+//                            .setIsExchangeCode(true)
+//                            .updateById();
+//                }
+//            }
+//        }finally {
+//            obtain.unlock();
+//        }
     }
 
 

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/common/GongdanLogic.java

@@ -1,483 +0,0 @@
-//package com.gree.mall.miniapp.logic.common;
-//
-//import com.alibaba.fastjson.JSONArray;
-//import com.alibaba.fastjson.JSONObject;
-//import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-//import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-//
-//import com.gree.mall.miniapp.bean.order.WorkerOrderInfo;
-//import com.gree.mall.miniapp.constant.Constant;
-//import com.gree.mall.miniapp.exception.RemoteServiceException;
-//import com.gree.mall.miniapp.plus.entity.OrderDetail;
-//import com.gree.mall.miniapp.plus.entity.OrderInfo;
-//import com.gree.mall.miniapp.plus.entity.OrderRequest;
-//import com.gree.mall.miniapp.plus.service.OrderDetailService;
-//import com.gree.mall.miniapp.plus.service.OrderInfoService;
-//import com.gree.mall.miniapp.plus.service.OrderRequestService;
-//import com.gree.mall.miniapp.utils.AESUtils;
-//import com.gree.mall.miniapp.utils.RedisUtil;
-//import com.gree.mall.miniapp.utils.http.HttpUtils;
-//import com.gree.mall.miniapp.utils.refund.Base64Util;
-//import lombok.extern.slf4j.Slf4j;
-//import org.apache.commons.lang3.StringUtils;
-//import org.junit.Test;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.scheduling.annotation.Async;
-//import org.springframework.stereotype.Service;
-//
-//import java.util.*;
-//import java.util.stream.Collectors;
-//
-///**
-// * 对接工单系统
-// */
-//@Slf4j
-//@Service
-//public class GongdanLogic {
-//
-//    @Value("${gongdan.token.get.url}")
-//    private String getTokenUrl;
-//    @Value("${gongdan.install.create.url}")
-//    private String createInstallUrl;
-//    @Value("${gongdan.repair.create.url}")
-//    private String createRepairUrl;
-//    @Value("${gongdan.install.detail.url}")
-//    private String detailInstallUrl;
-//    @Value("${gongdan.repair.detail.url}")
-//    private String detailRepairUrl;
-//    @Value("${gongdan.client_name}")
-//    private String clientName;
-//    @Value("${gongdan.password}")
-//    private String password;
-//    @Value("${gongdan.key}")
-//    private String key;
-//
-//    @Autowired
-//    OrderInfoService orderInfoService;
-//    @Autowired
-//    OrderDetailService orderDetailService;
-//    @Autowired
-//    OrderRequestService orderRequestService;
-//
-//    @Autowired
-//    RedisUtil redisUtil;
-//
-//    /**
-//     * 获取工单token
-//     * @return
-//     * @throws RemoteServiceException
-//     */
-//    public String getGongdanToken() throws Exception {
-//        redisUtil.del(Constant.RedisPrefix.TOKEN_GONGDAN);
-//        if(redisUtil.hasKey(Constant.RedisPrefix.TOKEN_GONGDAN)){
-//            String token = (String)redisUtil.get(Constant.RedisPrefix.TOKEN_GONGDAN);
-//            log.info("【获取工单token】：{}",token);
-//            return (String)redisUtil.get(Constant.RedisPrefix.TOKEN_GONGDAN);
-//        }
-//        Map<String,Object> dataContents = new HashMap<>();
-//        dataContents.put("password",password);
-//        //请求php服务
-//        JSONObject jsonObject = this.doPhpSevice(dataContents,null, getTokenUrl);
-//        JSONObject data = (JSONObject) jsonObject.get("data");
-//        //String time = (String) jsonObject.get("time");
-//        long time = new Date().getTime() / 1000;
-//        Integer exp = (Integer) data.get("exp");
-//        String token = (String)data.get("token");
-//        String prefix = (String)data.get("prefix");
-//        redisUtil.set(Constant.RedisPrefix.TOKEN_GONGDAN,prefix+token,exp - time - 100);
-//
-//        return token;
-//    }
-//
-//
-//    /**
-//     * 创建安装工单
-//     * @param orderInfo
-//     * @param mainNumber
-//     * @return
-//     * @throws Exception
-//     */
-//    @Async
-//    public String installOrder(OrderInfo orderInfo, List<OrderDetail> orderDetailList, String mainNumber) throws Exception {
-//        if(!orderInfo.getWorkOrder()){
-//            return null;
-//        }
-//        List<OrderDetail> orderDetail = orderDetailList.stream().filter(o -> o.getMainNumber().equals(mainNumber)).collect(Collectors.toList());
-//        if(CollectionUtils.isEmpty(orderDetail)){
-//            return null;
-//        }
-//        List<Integer> marketingIds = orderDetail.stream().map(OrderDetail::getMarketingId).distinct().collect(Collectors.toList());
-//        for(Integer marketingId : marketingIds) {
-//            Map<String, Object> map = new HashMap<>();
-//            map.put("websit_number", orderInfo.getWebsitNumber());
-//            map.put("websit_worker_mobile", orderInfo.getWorkerPhone());
-//            map.put("user_name", orderInfo.getReceUserName());
-//            map.put("user_phone", orderInfo.getRecePhone());
-//            map.put("user_phone2", orderInfo.getPhone());
-//            map.put("sales_order_no", orderInfo.getOrderId());
-//            if (orderInfo.getExchangeOrder()) {
-//                map.put("sales_type_id", 10);
-//            }
-//            map.put("buy_datetime", orderInfo.getPayTime().getTime() / 1000);
-//            map.put("province", orderInfo.getProvince());
-//            map.put("city", orderInfo.getCity());
-//            map.put("area", orderInfo.getArea());
-//            map.put("street", orderInfo.getStreet());
-//            map.put("address", orderInfo.getReceAddress()+orderInfo.getHouseNo());
-//            map.put("request_no", IdWorker.getIdStr());
-//            map.put("dispatch_type",orderInfo.getDispatchType());
-//            String remark = "";
-//            if(StringUtils.isNotBlank(orderInfo.getWorkerPhone()) && orderInfo.getCompanyWechatId().equals(Constant.GD_COMPANY_WECHAT_ID)){
-//                remark += "师傅名称:"+orderInfo.getWorkerName() + "(" + orderInfo.getWorkerPhone() + ")";
-//            }
-//            if(StringUtils.isNotBlank(orderInfo.getBuyerMsg())){
-//                remark += ",买家留言:"+orderInfo.getBuyerMsg();
-//            }
-//            if(StringUtils.isNotBlank(orderInfo.getRemark())){
-//                remark +=",商家备注："+orderInfo.getRemark();
-//            }
-//            if(StringUtils.isNotBlank(orderInfo.getDispatchType())){
-//                remark +=",工单派单方式："+orderInfo.getDispatchType();
-//            }
-//            if (StringUtils.isNotBlank(remark)) {
-//                map.put("remark", remark);
-//            }
-//            if(marketingId != null && marketingId !=0) {
-//                map.put("marketing_id", marketingId);
-//            }
-//            List<Map<String, Object>> productList = new ArrayList<>();
-//            List<String> orderDetailIds = new ArrayList<>();
-//            for (OrderDetail detail : orderDetail) {
-//                if (!mainNumber.equals(detail.getMainNumber()) || marketingId != detail.getMarketingId()) {
-//                    continue;
-//                }
-//                Map<String, Object> pMap = new HashMap<>();
-//                pMap.put("name", detail.getGoodsName());
-//                pMap.put("main_id", detail.getMainNumber());
-//                pMap.put("small_id",StringUtils.isBlank(detail.getSmallNumber())?"0":detail.getSmallNumber());
-//                pMap.put("number", detail.getNum() - detail.getRefundNum());
-//                pMap.put("price", detail.getPayAmount().subtract(detail.getRefundAmount()));
-//                pMap.put("pic_url",detail.getImgUrl());
-//                productList.add(pMap);
-//
-//                orderDetailIds.add(detail.getOrderDetailId());
-//            }
-//            if (productList.size() == 0) {
-//                return null;
-//            }
-//            map.put("product_list", productList);
-//            if(orderInfo.getCompanyWechatId().equals("1")) {
-//                map.put("order_source", 7);//3=分销商城
-//            }else{
-//                map.put("order_source",8);
-//            }
-//            Map<String, String> header = new HashMap<>();
-//            header.put("Authorization", this.getGongdanToken());
-//
-//            JSONObject jsonObject = this.doPhpSevice(map, header, createInstallUrl);
-//
-//            JSONObject data = (JSONObject) jsonObject.get("data");
-//            String workerOrderNo = (String) data.get("worker_order_no");
-//            Integer workerOrderId = (Integer)data.get("id");
-//
-//            OrderRequest orderRequest = new OrderRequest();
-//            orderRequest.setCreateTime(new Date());
-//            orderRequest.setMainNumber(mainNumber);
-//            orderRequest.setOrderId(orderInfo.getOrderId());
-//            orderRequest.setOrderType("INSTALL");
-//            orderRequest.setUserId(orderInfo.getUserId());
-//            orderRequest.setWorkerOrderId(workerOrderId);
-//            orderRequest.setWorkerOrderNo(workerOrderNo);
-//            orderRequest.insert();
-//
-//            //记录工单详情的工单号
-//            orderDetailService.lambdaUpdate().set(OrderDetail::getWorkerOrderNo,workerOrderNo).in(OrderDetail::getOrderDetailId,orderDetailIds).update();
-//        }
-//        return "";
-//    }
-//
-//
-//
-//    /**
-//     * 安装工单列表
-//     */
-//    public List<WorkerOrderInfo> getInstallOrderList(String orderId,String workerOrderNo,List<String> workerOrderNos) throws Exception {
-//
-//        List<WorkerOrderInfo> workerOrderInfos = new ArrayList<>();
-//        try{
-//            Map<String,Object> map = new HashMap<>();
-//            if(StringUtils.isNotBlank(orderId)) {
-//                map.put("request_order_no", orderId);
-//            }
-//            if(StringUtils.isNotBlank(workerOrderNo)){
-//                map.put("worker_order_no",workerOrderNo);
-//            }
-//            if(CollectionUtils.isNotEmpty(workerOrderNos)){
-//                map.put("worker_order_no_arr",workerOrderNos);
-//            }
-//            Map<String,String> header = new HashMap<>();
-//            header.put("Authorization",this.getGongdanToken());
-//            JSONObject jsonObject  = this.doPhpSevice(map, header, detailInstallUrl);
-//            JSONArray datas = (JSONArray)jsonObject.get("data");
-//            for(Object o : datas) {
-//                JSONObject data = (JSONObject)o;
-//                WorkerOrderInfo workerOrderInfo = new WorkerOrderInfo();
-//                workerOrderInfo.setWorkerOrder(data.getString("worker_order_no"));
-//                workerOrderInfo.setPgid(data.getString("pgid"));
-//                workerOrderInfo.setWorkerName(data.getString("worker_name"));
-//                workerOrderInfo.setWorkerPhone(data.getString("worker_phone"));
-//                workerOrderInfo.setInstallNumber(data.getString("install_number"));
-//                workerOrderInfo.setInstallName(data.getString("install_name"));
-//                workerOrderInfo.setOrderStateInt(data.getInteger("order_state"));
-//                workerOrderInfo.setOrderState(data.getString("order_state"));
-//                workerOrderInfo.setOrderReceTime(data.getString("receive_time_text"));
-//                workerOrderInfo.setFinishTime(data.getString("finish_time_text"));
-//                workerOrderInfo.setReserveTime(data.getString("reserve_datetime_text"));
-//                workerOrderInfo.setServerContent("安装服务");
-//                workerOrderInfo.setBracket(data.getString("bracket"));
-//                workerOrderInfo.setPipe(data.getString("pipe"));
-//                workerOrderInfo.setSwitchFlag(data.getString("switch_flag"));
-//                workerOrderInfo.setHighAltitude(data.getString("high_altitude"));
-//                workerOrderInfo.setHole(data.getString("hole"));
-//                workerOrderInfo.setRemark(data.getString("remark"));
-//                workerOrderInfo.setPayTime(data.getString("buy_datetime_text"));
-//                workerOrderInfo.setOrderId(data.getString("sales_order_no"));
-//                workerOrderInfo.setMainName(data.getString("main_name"));
-//                workerOrderInfo.setCreateTime(data.getString("appoint_datetime_text"));
-//                //产品
-//                List<Map<String, String>> products = (List<Map<String, String>>)data.get("order_install_product");
-//                workerOrderInfo.setGoods(products);
-//                //辅助人员
-//                List<Map<String, String>> assist = (List<Map<String, String>>) data.get("assist_data_list");
-//                if(CollectionUtils.isNotEmpty(assist)){
-//                    workerOrderInfo.setAssistName(assist.get(0).get("name"));
-//                }
-//                //操作类型
-//                List<WorkerOrderInfo.Fkxx> fkxxs = new ArrayList<>();
-//                List<Map<String, String>> operators = (List<Map<String, String>>) data.get("order_install_operating_log");
-//                if (CollectionUtils.isNotEmpty(operators)) {
-//                    for (Map<String, String> operator : operators) {
-//                        WorkerOrderInfo.Fkxx fkxx = new WorkerOrderInfo.Fkxx();
-//                        fkxx.setOperatorType(operator.get("type"));
-//                        fkxx.setOperatorContent(operator.get("content"));
-//                        fkxx.setLastOperatorTime(operator.get("updatetime"));
-//                        fkxx.setOperatorName(operator.get("operator"));
-//                        fkxx.setOperatorWebsit(operator.get("operate_websit"));
-//                        fkxx.setResult(operator.get("feedback"));
-//                        fkxxs.add(fkxx);
-//                    }
-//                    workerOrderInfo.setFkxxs(fkxxs);
-//                }
-//                List<Map<String, Object>> stocks = (List<Map<String, Object>>) data.get("stock_order");
-//                if (CollectionUtils.isNotEmpty(stocks)) {
-//                    //辅材信息
-//                    List<WorkerOrderInfo.Fcxx> fcxxs = new ArrayList<>();
-//                    for (Map<String, Object> stock : stocks) {
-//                        WorkerOrderInfo.Fcxx fcxx = new WorkerOrderInfo.Fcxx();
-//                        fcxx.setId((Integer)stock.get("id"));
-//                        fcxx.setOrderNo((String) stock.get("docnum"));
-//                        fcxx.setOperatorWebsit((String) stock.get("websit_name"));
-//                        fcxx.setOperatorName((String) stock.get("worker_name"));
-//                        fcxx.setPayStatus((String) stock.get("pay_status_text"));
-//                        fcxx.setPayTime((String) stock.get("paytime_text"));
-//                        fcxx.setAmount((String) stock.get("total_amount"));
-//                        fcxx.setRemark((String) stock.get("remark"));
-//
-//                        List<Map<String, Object>> details = (List<Map<String, Object>>) stock.get("stock_order_goods");
-//                        fcxx.setDetails(details);
-//                        fcxxs.add(fcxx);
-//                    }
-//                    workerOrderInfo.setFcxxs(fcxxs);
-//                }
-//
-//                workerOrderInfos.add(workerOrderInfo);
-//            }
-//        }catch(Exception e){
-//            log.error("获取安装工单列表失败",e);
-//        }
-//        return workerOrderInfos;
-//
-//    }
-//
-//
-//    /**
-//     * 维修工单列表
-//     */
-//    public List<WorkerOrderInfo> getRepairOrderList(String orderId,String workerOrderNo,List<String> repairWorkerOrderNos) throws Exception {
-//
-//        List<WorkerOrderInfo> workerOrderInfos = new ArrayList<>();
-//        try {
-//            Map<String, Object> map = new HashMap<>();
-//            if(StringUtils.isNotBlank(orderId)) {
-//                map.put("request_order_no", orderId);
-//            }
-//            if(StringUtils.isNotBlank(workerOrderNo)){
-//                map.put("worker_order_no",workerOrderNo);
-//            }
-//            if(CollectionUtils.isNotEmpty(repairWorkerOrderNos)){
-//                map.put("worker_order_no_arr",repairWorkerOrderNos);
-//            }
-//            Map<String, String> header = new HashMap<>();
-//            header.put("Authorization", this.getGongdanToken());
-//            JSONObject jsonObject = this.doPhpSevice(map, header, detailRepairUrl);
-//            JSONArray datas = (JSONArray) jsonObject.get("data");
-//            for (Object o : datas) {
-//                JSONObject data = (JSONObject) o;
-//                WorkerOrderInfo workerOrderInfo = new WorkerOrderInfo();
-//                workerOrderInfo.setWorkerOrder(data.getString("worker_order_no"));
-//                workerOrderInfo.setPgid(data.getString("pgid"));
-//                workerOrderInfo.setWorkerName(data.getString("woname"));
-//                workerOrderInfo.setWorkerPhone(data.getString("wophone"));
-//                workerOrderInfo.setInstallNumber(data.getString("after_number"));
-//                workerOrderInfo.setInstallName(data.getString("after_wname"));
-//                workerOrderInfo.setOrderStateInt(data.getInteger("order_state"));
-//                workerOrderInfo.setOrderState(data.getString("order_state"));
-//                workerOrderInfo.setOrderReceTime(data.getString("receive_time_text"));
-//                workerOrderInfo.setFinishTime(data.getString("finish_time_text"));
-//                workerOrderInfo.setServerContent("清洗服务");
-//                workerOrderInfo.setBracket(data.getString("bracket"));
-//                workerOrderInfo.setReserveTime(data.getString("reserve_datetime_text"));
-//                workerOrderInfo.setPipe(data.getString("pipe"));
-//                workerOrderInfo.setSwitchFlag(data.getString("switch_flag"));
-//                workerOrderInfo.setHighAltitude(data.getString("high_altitude"));
-//                workerOrderInfo.setHole(data.getString("hole"));
-//                workerOrderInfo.setRemark(data.getString("remark"));
-//                workerOrderInfo.setPayTime(data.getString("buy_datetime_text"));
-//                workerOrderInfo.setOrderId(data.getString("sales_order_no"));
-//                workerOrderInfo.setMainName(data.getString("main_name"));
-//                workerOrderInfo.setCreateTime(data.getString("appoint_datetime_text"));
-//                //操作类型
-//                List<WorkerOrderInfo.Fkxx> fkxxs = new ArrayList<>();
-//                List<Map<String, String>> operators = (List<Map<String, String>>) data.get("order_install_operating_log");
-//                if (CollectionUtils.isNotEmpty(operators)) {
-//                    for (Map<String, String> operator : operators) {
-//                        WorkerOrderInfo.Fkxx fkxx = new WorkerOrderInfo.Fkxx();
-//                        fkxx.setOperatorType(operator.get("type"));
-//                        fkxx.setOperatorContent(operator.get("content"));
-//                        fkxx.setLastOperatorTime(operator.get("updatetime"));
-//                        fkxx.setOperatorName(operator.get("operator"));
-//                        fkxx.setOperatorWebsit(operator.get("operate_websit"));
-//                        fkxx.setResult(operator.get("feedback"));
-//                        fkxxs.add(fkxx);
-//                    }
-//                    workerOrderInfo.setFkxxs(fkxxs);
-//                }
-//                List<Map<String, Object>> stocks = (List<Map<String, Object>>) data.get("stock_order");
-//                if (CollectionUtils.isNotEmpty(stocks)) {
-//                    //辅材信息
-//                    List<WorkerOrderInfo.Fcxx> fcxxs = new ArrayList<>();
-//                    for (Map<String, Object> stock : stocks) {
-//                        WorkerOrderInfo.Fcxx fcxx = new WorkerOrderInfo.Fcxx();
-//                        fcxx.setId((int)stock.get("id"));
-//                        fcxx.setOrderNo((String) stock.get("docnum"));
-//                        fcxx.setOperatorWebsit((String) stock.get("websit_name"));
-//                        fcxx.setOperatorName((String) stock.get("worker_name"));
-//                        fcxx.setPayStatus((String) stock.get("pay_status_text"));
-//                        fcxx.setPayTime((String) stock.get("paytime_text"));
-//                        fcxx.setAmount((String) stock.get("total_amount"));
-//                        fcxx.setRemark((String) stock.get("remark"));
-//
-//                        List<Map<String, Object>> details = (List<Map<String, Object>>) stock.get("stock_order_goods");
-//                        fcxx.setDetails(details);
-//                        fcxxs.add(fcxx);
-//                    }
-//                    workerOrderInfo.setFcxxs(fcxxs);
-//                }
-//
-//                workerOrderInfos.add(workerOrderInfo);
-//            }
-//        }catch(Exception e){
-//            log.error("获取维修工单列表失败",e);
-//        }
-//        return workerOrderInfos;
-//
-//    }
-//
-//
-//
-//
-//    private JSONObject doPhpSevice(Map<String,Object> dataContents,Map<String,String> header,String url) throws Exception {
-//        return this.doPhpSevice(dataContents,header,url,"POST");
-//    }
-//
-//    /**
-//     * 通用请求
-//     * @param dataContents
-//     * @param header
-//     * @param url
-//     * @return
-//     * @throws Exception
-//     */
-//    private JSONObject doPhpSevice(Map<String,Object> dataContents,Map<String,String> header,String url,String method) throws Exception {
-//        String ivValue = get16Random();
-//        String iv = Base64Util.encode(ivValue.getBytes());
-//
-//        //dataContents.put("password",password);
-//        String dataJson = JSONObject.toJSONString(dataContents);
-//        log.info("【请求工单服务】request...：dataContents:{},iv:{},client_name:{}",dataJson,ivValue,clientName);
-//        byte[] bytes = AESUtils.encryptAES(dataJson,ivValue,key).getBytes();
-//        String encode = Base64Util.encode(bytes);
-//
-//        Map<String,String> map = new HashMap<>();
-//        map.put("client_name",clientName);
-//        map.put("data_contents",encode);
-//        map.put("iv",iv);
-//
-//        log.info("【请求工单服务，加密】request...：{}",JSONObject.toJSONString(map));
-//        String s = "";
-//        if(StringUtils.equals(method,"POST")) {
-//            s = HttpUtils.requestPostForm(url, map, header);
-//        }else{
-//            s = HttpUtils.requestGet(url, map, header);
-//        }
-//        log.info("【请求工单服务】response...：{}",s);
-//        JSONObject jsonObject = JSONObject.parseObject(s);
-//        if(jsonObject == null || !jsonObject.get("code").toString().equals("1")){
-//            throw new RemoteServiceException("对接工单系统失败,请联系相关开发人员");
-//        }
-//        return jsonObject;
-//    }
-//
-//
-//
-//
-//    public static String get16Random(){
-//        //随机生成一位整数
-//        int random = (int) (Math.random()*9+1);
-//        String valueOf = String.valueOf(random);
-//        //生成uuid的hashCode值
-//        int hashCode = UUID.randomUUID().toString().hashCode();
-//        //可能为负数
-//        if(hashCode<0){
-//            hashCode = -hashCode;
-//        }
-//        String value = valueOf + String.format("%015d", hashCode);
-//        return value;
-//    }
-//
-//
-//    public String checkSign(String data,String iv,String lKey){
-//        String s = "";
-//        log.info("【工单进度通知】content:{},iv:{},lKey:{}",data,iv,lKey);
-//        try{
-//            String rIv = new String(Base64Util.decode(iv));
-//            //String data = new String(Base64Util.decode(content));
-//            if(StringUtils.isBlank(lKey)){
-//                lKey = key;
-//            }
-//            s = AESUtils.decryptAES(data, rIv, lKey);
-//        }catch (Exception e){
-//            throw new RemoteServiceException("解密失败");
-//        }
-//        if(StringUtils.isBlank(s)){
-//            throw new RemoteServiceException("解密失败");
-//        }
-//        return s;
-//    }
-//
-//
-//
-//
-//
-//}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/coupon/CouponLogic.java

@@ -248,8 +248,6 @@ public class CouponLogic {
                     userCoupon.setActiveEndTime(DateUtils.getStartTimeByDay(coupon.getActiveDay() + 1));
                 }
                 userCoupon.setState(now.before(coupon.getActiveEndTime()) && now.after(coupon.getActiveStartTime()));
-                userCoupon.setCompanyWechatId(user.getCompanyWechatId());
-                userCoupon.setCompanyName(user.getCompanyName());
                 list.add(userCoupon);
             }
             userCouponService.saveBatch(list);
@@ -346,7 +344,7 @@ public class CouponLogic {
                 throw new RemoteServiceException("优惠已被用户使用");
             }
 
-            transferCouponId = transfer(user.getUserId(), userCouponId , user.getCompanyWechatId(), user.getCompanyName());
+            transferCouponId = transfer(user.getUserId(), userCouponId, null, null);
         } catch (InterruptedException e) {
             log.error("", e);
             throw new RemoteServiceException("系统繁忙，请稍后再试");

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/goods/GoodsLogic.java

@@ -167,8 +167,6 @@ public class GoodsLogic {
      * @return
      */
     public GoodsBean commonDetail(String goodsId, User user, String storageId) throws RemoteServiceException {
-        AdminCompanyWechat adminCompanyWechat = commonLogic.getAdminCompanyWechat(user.getCompanyWechatId());
-
         Goods goods = goodsService.lambdaQuery()
                 .eq(Goods::getGoodsId, goodsId)
                 .eq(Goods::getDel, false)
@@ -220,52 +218,6 @@ public class GoodsLogic {
     }
 
     /**
-     * 团购商品列表
-     * @param userId
-     * @return
-     */
-    public IPage<PromotionGoodsBean> myGroupGoods(String userId,String goodsCategoryId, String keyword, Integer pageNum, Integer pageSize,HttpServletRequest request){
-        User user = userService.getById(userId);
-        if(!user.getPromotionGroupLeader()){
-            userId = user.getPromotionGroupUserId();
-        }
-        CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat(request);
-        String companyWechatId = currentCompanyWechat.getCompanyWechatId();
-        IPage<PromotionGoodsBean> promotionGoodsBeanIPage = goodsSpecDetailMapper.queryPromotionGoods(new Page(pageNum, pageSize), userId,goodsCategoryId, keyword,companyWechatId);
-        return promotionGoodsBeanIPage;
-    }
-
-    /**
-     * 团购活动二维码
-     */
-    public PromotionShareQrCode queryShareQrcode(String userId,HttpServletRequest request) throws IOException {
-        CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat(request);
-        User user = userService.getById(currentCompanyWechat.getUserId());
-        if(!user.getStatus() || !user.getPromotionGroupLeader()){
-            throw new RemoteServiceException("无效的用户");
-        }
-        //查询活动背景图
-        List<PromotionGroup> list = promotionGroupService.lambdaQuery()
-                .le(PromotionGroup::getStartTime, new Date())
-                .ge(PromotionGroup::getEndTime, new Date())
-                .eq(PromotionGroup::getStatus, true)
-                .eq(PromotionGroup::getCompanyWechatId,user.getCompanyWechatId())
-                .orderByDesc(PromotionGroup::getCreateTime)
-                .list();
-        if(list.size() == 0){
-            return null;
-        }
-        PromotionGroup promotionGroup = list.get(0);
-        String qrcode = wechatLogic.getQrcode(QrCodeEnum.PROMOTION_GROUP.toString().toLowerCase(),promotionGroup.getPromotionGroupId(),userId,user.getCompanyWechatId());
-        PromotionShareQrCode promotionShareQrCode = new PromotionShareQrCode();
-        promotionShareQrCode.setPromotionImgUrl(qrcode);
-        promotionShareQrCode.setQrcode(qrcode);
-        promotionShareQrCode.setPromotionImgUrl(promotionGroup.getImgUrl());
-        promotionShareQrCode.setPosterImgUrl(promotionGroup.getPosterImgUrl());
-        return promotionShareQrCode;
-    }
-
-    /**
      * 获取商品
      * @param goodsId
      * @return

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/GreeLogic.java

@@ -1,179 +0,0 @@
-//package com.gree.mall.miniapp.logic.order;
-//
-//import com.alibaba.fastjson.JSONObject;
-//import org.apache.commons.lang3.StringUtils;
-//import com.gree.mall.miniapp.bean.gree.WorkOrderBean;
-//import com.gree.mall.miniapp.constant.Constant;
-//import com.gree.mall.miniapp.exception.RemoteServiceException;
-//import com.gree.mall.miniapp.plus.entity.OrderDetail;
-//import com.gree.mall.miniapp.plus.entity.OrderInfo;
-//import com.gree.mall.miniapp.plus.service.OrderDetailService;
-//import com.gree.mall.miniapp.plus.service.OrderInfoService;
-//import com.gree.mall.miniapp.utils.*;
-//import lombok.extern.slf4j.Slf4j;
-//import org.apache.commons.codec.digest.DigestUtils;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.beans.factory.annotation.Value;
-//import org.springframework.stereotype.Service;
-//
-//import java.math.BigDecimal;
-//import java.util.*;
-//
-///**
-// * 对接总部接口
-// */
-//@Slf4j
-//@Service
-//public class GreeLogic {
-//
-//
-//    private static final String appId = "GglcSDasaleWitelsgy123mxidk";
-//    private static final String secret = "sfgasfdowjefoiw571jfgglsaledvowndowjfeowjemmlwguangijetyebnfsscfhb";
-//    private static final String key = "yedglste489gasdif6eikiguangfidfssfsfdweyeemmf35rwfwfw234sdfwfssc";
-//
-//    @Value("${gree.url.token}")
-//    private String greeUrlToken;
-//    @Value("${gree.url.fxInstallReq}")
-//    private String fxInstallReq;
-//    @Autowired
-//    RedisUtil redisUtil;
-//    @Autowired
-//    OrderInfoService orderInfoService;
-//    @Autowired
-//    OrderDetailService orderDetailService;
-//
-//
-//    /**
-//     * 获取token
-//     */
-//    public String getToken() throws RemoteServiceException {
-//        String redisKey = Constant.RedisPrefix.TOKEN_GREE;
-//        String token = (String)redisUtil.get(redisKey);
-//        if(StringUtils.isNotBlank(token)){
-//            return token;
-//        }
-//        String url = this.greeUrlToken + "?appid=" + appId + "&secret=" + secret;
-//        String s = HttpUtils.requestGet(url, null, null);
-//        log.info("【获取总部工单对接token】:{}",url+"||response:"+s);
-//        String access_token = (String)JSONObject.parseObject(s).get("access_token");
-//        redisUtil.set(redisKey,access_token,2*60*60);
-//        return access_token;
-//    }
-//
-//
-//    /**
-//     * 下工单
-//     */
-//    public void postWorkOrder(String orderId) throws RemoteServiceException {
-//        OrderInfo orderInfo = orderInfoService.getById(orderId);
-//        List<OrderDetail> list = orderDetailService.lambdaQuery().eq(OrderDetail::getOrderId, orderId).list();
-//
-//        WorkOrderBean workOrderBean = new WorkOrderBean();
-//        workOrderBean.setFx_sale_order_no(orderInfo.getOrderId());
-//        workOrderBean.setUser_name(orderInfo.getReceUserName());
-//        workOrderBean.setUser_phone(orderInfo.getRecePhone());
-//        workOrderBean.setProvince(orderInfo.getProvince());
-//        workOrderBean.setCity(orderInfo.getCity());
-//        workOrderBean.setArea(orderInfo.getArea());
-//        workOrderBean.setStreet(StringUtils.isBlank(orderInfo.getStreet())?"0":orderInfo.getStreet());
-//        workOrderBean.setAddress(orderInfo.getReceAddress());
-//        workOrderBean.setUser_contact(orderInfo.getReceUserName());
-//        workOrderBean.setPayment_time(DateUtils.formatDate(orderInfo.getPayTime()));
-//        workOrderBean.setClerk_id("0");
-//        workOrderBean.setClerk_name(orderInfo.getWorkerName());
-//        workOrderBean.setClerk_phone(orderInfo.getWorkerPhone());
-//        workOrderBean.setWebsit_number(orderInfo.getWebsitNumber());
-//
-//        List<Map<String,Object>> datas = new ArrayList<>();
-//        for(OrderDetail orderDetail : list){
-//            Map<String,Object> map = new HashMap<>();
-//            map.put("unit","个");
-//            map.put("number",orderDetail.getNum());
-//            map.put("price",orderDetail.getPayAmount());
-//            map.put("small_id",0);
-//            map.put("small_name","0");
-//            map.put("series_name","0");
-//            map.put("pname",orderDetail.getGoodsName());
-//            datas.add(map);
-//        }
-//        workOrderBean.setItf_fx_install_req_data(datas);
-//        HashMap<String, String> map = Utils.objectToStringMap(workOrderBean);
-//        map.put("appId",appId);
-//        map.put("secret",secret);
-//        map.put("access_token", getToken());
-//        //排序
-//        String linkStr = createLinkString(map, false, key);
-//        //签名
-//        String sign = DigestUtils.md5Hex(linkStr).toUpperCase();
-//        map.put("sign", sign);
-//
-//        log.info("下单request:{},param:{}",fxInstallReq,JSONObject.toJSONString(map));
-//        //发送请求
-//        String respBody = HttpUtils.requestPostForm(fxInstallReq, map, new HashMap<>());
-//        log.info("下单response:{}",respBody);
-//    }
-//
-//
-//    private static String md5Sign(Map<String, Object> map, String key) {
-//        String result = toParam(map);
-//        result += "&key=" + key;
-//        result = MD5.md5(result).toUpperCase();
-//        return result;
-//    }
-//
-//
-//    private static String toParam(Map<String, Object> map){
-//        ArrayList<String> list = new ArrayList<String>();
-//        for (Map.Entry<String, Object> entry : map.entrySet()) {
-//            if (entry.getValue() != "") {
-//                list.add(entry.getKey() + "=" + entry.getValue());
-//            }
-//        }
-//        int size = list.size();
-//        String[] arrayToSort = list.toArray(new String[size]);
-//        Arrays.sort(arrayToSort, String.CASE_INSENSITIVE_ORDER);
-//
-//        String result = join(arrayToSort, "&");
-//        return result;
-//    }
-//
-//    private static String join(String[] values, String delimeter) {
-//        StringBuffer sb = new StringBuffer();
-//        for (String value : values) {
-//            if (sb.length() > 0) {
-//                sb.append(delimeter);
-//            }
-//            sb.append(value);
-//        }
-//        return sb.toString();
-//    }
-//
-//    /**
-//     * 把数组所有元素排序，并按照“参数=参数值”的模式用“&”字符拼接成字符串
-//     *
-//     * @param params 需要排序并参与字符拼接的参数组
-//     * @param emptyPass 参数内容为空是否参与
-//     * @param secretKey
-//     * @return 拼接后字符串
-//     */
-//    private String createLinkString(Map<String, String> params, boolean emptyPass, String secretKey) {
-//        List<String> keys = new ArrayList<String>(params.keySet());
-//        Collections.sort(keys);
-//        String preStr = "";
-//        for (int i = 0; i<keys.size(); i++) {
-//            String key = keys.get(i);
-//            String value = params.get(key);
-//
-//            if(!emptyPass){
-//                if(value == null || value.length() == 0){
-//                    continue;
-//                }
-//            }
-//            preStr = preStr + key + "=" + value + "&";
-//        }
-//        preStr = preStr + "key=" + secretKey;
-//
-//        return preStr;
-//    }
-//
-//}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/LeaseOrderLogic.java

@@ -1,318 +0,0 @@
-package com.gree.mall.miniapp.logic.order;
-
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gree.mall.miniapp.bean.PayDetail;
-import com.gree.mall.miniapp.bean.order.LeaseOrderBean;
-import com.gree.mall.miniapp.bean.order.LeaseOrderVO;
-import com.gree.mall.miniapp.bean.user.CurrentCompanyWechat;
-import com.gree.mall.miniapp.commonmapper.CommonMapper;
-import com.gree.mall.miniapp.enums.OrderInfoSourceEnum;
-import com.gree.mall.miniapp.enums.PayTypeEnum;
-import com.gree.mall.miniapp.exception.RemoteServiceException;
-import com.gree.mall.miniapp.logic.common.CommonLogic;
-import com.gree.mall.miniapp.logic.common.outside.WechatLogic;
-import com.gree.mall.miniapp.plus.entity.*;
-import com.gree.mall.miniapp.plus.service.*;
-import com.gree.mall.miniapp.utils.IpUtil;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class LeaseOrderLogic {
-
-    private final CommonLogic commonLogic;
-    private final CommonMapper commonMapper;
-    private final LeaseOrderService leaseOrderService;
-    private final LeaseOrderItemService leaseOrderItemService;
-    private final LeaseOrderPayRecordService leaseOrderPayRecordService;
-    private final GoodsLeaseService goodsLeaseService;
-    private final WechatLogic wechatLogic;
-    private final UserAddressService userAddressService;
-
-    @Transactional
-    public String add(LeaseOrderBean bean) {
-        CurrentCompanyWechat wechat = commonLogic.getCurrentCompanyWechat();
-        if (StringUtils.isBlank(bean.getUserAddressId())) {
-            throw new RemoteServiceException("请选择收货地址");
-        }
-        final UserAddress userAddress = userAddressService.lambdaQuery()
-                .eq(UserAddress::getCompanyWechatId, wechat.getCurrentCompanyWechatId())
-                .eq(UserAddress::getUserAddressId, bean.getUserAddressId())
-                .one();
-        if (Objects.isNull(userAddress)) {
-            throw new RemoteServiceException("收货地址信息异常");
-        }
-        if (CollectionUtil.isEmpty(bean.getItems())) {
-            throw new RemoteServiceException("商品信息不能为空");
-        }
-        LeaseOrderItem orderItem = bean.getItems().get(0);
-        if (Objects.isNull(orderItem.getStartDate())) {
-            throw new RemoteServiceException("请选择租赁开始日期");
-        }
-        final DateTime curTimeDate = DateUtil.parseDate(DateUtil.formatDate(DateUtil.date()));
-        if (orderItem.getStartDate().getTime() < curTimeDate.getTime()) {
-            throw new RemoteServiceException("租赁开始日期必须大于等于当前日期");
-        }
-        if (Objects.isNull(orderItem.getGoodsLeaseId())) {
-            throw new RemoteServiceException("租赁商品不能为空");
-        }
-        if (Objects.isNull(orderItem.getEndDate())) {
-            throw new RemoteServiceException("请选择租赁结束日期");
-        }
-        if (orderItem.getStartDate().getTime() > orderItem.getEndDate().getTime()) {
-            throw new RemoteServiceException("租赁开始日期不能大于租赁结束日期");
-        }
-        if (Objects.isNull(orderItem.getQty()) || orderItem.getQty() <= 0) {
-            throw new RemoteServiceException("数量异常");
-        }
-
-        final GoodsLease goodsLease = goodsLeaseService.lambdaQuery()
-                .eq(GoodsLease::getCompanyWechatId, wechat.getUser().getCompanyWechatId())
-                .eq(GoodsLease::getId, orderItem.getGoodsLeaseId())
-                .eq(GoodsLease::getStatus, true)
-                .last("limit 1")
-                .one();
-
-        if (Objects.isNull(goodsLease)) {
-            throw new RemoteServiceException("租赁商品信息不存在，请检查");
-        }
-
-        final String id = commonLogic.generateNo("ZP", "LEASE_ORDER", 13);
-        BigDecimal bookAmount = BigDecimal.ZERO;
-
-        orderItem.setLeaseOrderId(id)
-                .setCompanyWechatId(wechat.getUser().getCompanyWechatId())
-                .setCompanyWechatName(wechat.getUser().getCompanyName())
-                .setCategoryId(goodsLease.getCategoryId())
-                .setCategoryName(goodsLease.getCategoryName())
-                .setCategoryUrl(goodsLease.getCategoryUrl())
-                .setGoodsLeaseName(goodsLease.getName())
-                .setGoodsUnit(goodsLease.getUnit())
-                .setDepositPrice(goodsLease.getDepositPrice())
-                .setLeasePrice(goodsLease.getLeasePrice())
-                .setRepairRemark(goodsLease.getRepairRemark())
-                .insert();
-
-        bookAmount = bookAmount.add(orderItem.getDepositPrice().multiply(BigDecimal.valueOf(orderItem.getQty())));
-
-
-        bean.setId(id)
-                .setOnLineBill(true)
-                .setCompanyWechatId(wechat.getUser().getCompanyWechatId())
-                .setCompanyWechatName(wechat.getUser().getCompanyName())
-                .setUserId(wechat.getUserId())
-                .setUserName(wechat.getUser().getNickName())
-                .setUserMobile(wechat.getUser().getMobile())
-                .setUserAddress(userAddress.getAddress())
-                .setProvinceId(userAddress.getProvinceId())
-                .setAreaId(userAddress.getAreaId())
-                .setCityId(userAddress.getCityId())
-                .setStreetId(userAddress.getStreetId())
-                .setProvince(userAddress.getProvince())
-                .setArea(userAddress.getArea())
-                .setCity(userAddress.getCity())
-                .setStreet(userAddress.getStreet())
-                .setPayType(PayTypeEnum.WECHAT.getKey())
-                .setPayStatus(false)
-                .setBookAmount(bookAmount)
-                .setStatus("WAIT")
-                .insert();
-        return id;
-    }
-
-    public IPage<LeaseOrderVO> page(String keyword, Boolean payStatus, String status, Integer pageNum, Integer pageSize) {
-        CurrentCompanyWechat wechat = commonLogic.getCurrentCompanyWechat();
-        Boolean isEndDate = false;
-        if ("OVER,RECOVER".contains(status)) {
-            isEndDate = true;
-        }
-        final IPage<LeaseOrderVO> page = commonMapper.leaseOrderList(new Page<>(pageNum, pageSize), wechat.getUserId(), keyword, payStatus, status, isEndDate);
-        return page;
-    }
-
-    @Transactional
-    public PayDetail pay(HttpServletRequest request, String leaseOrderId, Boolean miniPay, String openId, Date realEndDate, String remark) {
-        String ip = IpUtil.getIpAddr(request);
-        CurrentCompanyWechat wechat = commonLogic.getCurrentCompanyWechat(request);
-        LeaseOrder order = leaseOrderService.lambdaQuery()
-                .eq(LeaseOrder::getId, leaseOrderId)
-                .eq(LeaseOrder::getUserId, wechat.getUserId())
-                .one();
-
-        if (Objects.isNull(order)) {
-            throw new RemoteServiceException(leaseOrderId + "订单号不存在，无法发起支付");
-        }
-        final LeaseOrderItem item = leaseOrderItemService.lambdaQuery()
-                .eq(LeaseOrderItem::getLeaseOrderId, order.getId())
-                .last("limit 1")
-                .one();
-
-        BigDecimal payValue;
-        if (miniPay != null && miniPay) {
-            leaseOrderService.lambdaUpdate()
-                    .eq(LeaseOrder::getId, leaseOrderId)
-                    .set(LeaseOrder::getSource, OrderInfoSourceEnum.A.getRemark())
-                    .update();
-        }else {
-            leaseOrderService.lambdaUpdate()
-                    .eq(LeaseOrder::getId, leaseOrderId)
-                    .set(LeaseOrder::getSource, OrderInfoSourceEnum.B.getRemark())
-                    .update();
-        }
-
-        if (!order.getPayStatus() && order.getStatus().equals("WAIT")) {
-            payValue = order.getBookAmount();
-            LeaseOrderPayRecord record = new LeaseOrderPayRecord();
-            record.setCompanyWechatId(order.getCompanyWechatId())
-                    .setCompanyWechatName(order.getCompanyWechatName())
-                    .setLeaseOrderId(order.getId())
-                    .setOrderType("FIRST")
-                    .setUserId(order.getUserId())
-                    .setPayValue(order.getBookAmount())
-                    .setPayStatus(false)
-                    .setSort(1)
-                    .setOutTradeNo(leaseOrderId + "-" + record.getSort())
-                    .setRenewalPrice(item.getRenewalPrice());
-
-            if (order.getBookAmount().compareTo(BigDecimal.ZERO) <= 0) {
-                record.setPayStatus(true)
-                        .setStartDate(item.getStartDate())
-                        .setEndDate(item.getEndDate())
-                        .insert();
-                order.setPayStatus(true)
-                        .updateById();
-                PayDetail payDetail = new PayDetail();
-                payDetail.setIsPay(false);
-
-                return payDetail;
-            }
-
-            record.insert();
-
-            leaseOrderId = record.getOutTradeNo();
-        } else if ((order.getStatus().equals("LEASE") || order.getStatus().equals("OVER")) && order.getPayStatus()) {
-            if (Objects.isNull(realEndDate)) {
-                throw new RemoteServiceException("请选择续租结束日期");
-            }
-            final Integer count = leaseOrderPayRecordService.lambdaQuery()
-                    .eq(LeaseOrderPayRecord::getLeaseOrderId, order.getId())
-                    .count();
-
-            final LeaseOrderPayRecord renewalRecord = leaseOrderPayRecordService.lambdaQuery()
-                    .eq(LeaseOrderPayRecord::getOrderType, "RENEWAL")
-                    .eq(LeaseOrderPayRecord::getPayStatus, true)
-                    .orderByDesc(LeaseOrderPayRecord::getCreateTime)
-                    .last("LIMIT 1")
-                    .one();
-
-            if (Objects.nonNull(renewalRecord) && renewalRecord.getEndDate().after(DateUtil.date())) {
-                throw new RemoteServiceException("上次续租日期未到期，请到期后操作");
-            }
-
-            // 当前单据的过期日期
-            Date orderDate = Objects.isNull(item.getRealEndDate()) ? item.getEndDate() : item.getRealEndDate();
-            if (realEndDate.getTime() <= orderDate.getTime()) {
-                throw new RemoteServiceException("续租结束日期必须大于到期日期");
-            }
-
-            // 续租总租金=数量*续租单价/30天*（实际到期日期-到期日期）
-            long leaseDay = DateUtil.betweenDay(orderDate, realEndDate, true);
-
-            payValue = BigDecimal.valueOf(item.getQty())
-                        .multiply(item.getRenewalPrice())
-                        .divide(BigDecimal.valueOf(30L), 2, BigDecimal.ROUND_HALF_UP)
-                        .multiply(BigDecimal.valueOf(leaseDay));
-
-            payValue = payValue.compareTo(BigDecimal.ZERO) <= 0 ? item.getRenewalPrice().multiply(BigDecimal.valueOf(leaseDay)) : payValue;
-
-            payValue = payValue.compareTo(BigDecimal.ZERO) <= 0 ? item.getRenewalPrice() : payValue;
-
-            if (payValue.compareTo(BigDecimal.ZERO) <= 0) {
-                throw new RemoteServiceException("续租金额计算为0，续租支付失败");
-            }
-
-            LeaseOrderPayRecord record = new LeaseOrderPayRecord();
-            record.setCompanyWechatId(order.getCompanyWechatId())
-                    .setCompanyWechatName(order.getCompanyWechatName())
-                    .setLeaseOrderId(order.getId())
-                    .setPayValue(payValue)
-                    .setOrderType("RENEWAL")
-                    .setUserId(order.getUserId())
-                    .setStartDate(DateUtil.offsetDay(orderDate, 1))
-                    .setEndDate(realEndDate)
-                    .setPayStatus(false)
-                    .setSort(count)
-                    .setRemark(remark)
-                    .setOutTradeNo(leaseOrderId + "-" + record.getSort())
-                    .setRenewalPrice(item.getRenewalPrice())
-                    .insert();
-            leaseOrderId = record.getOutTradeNo();
-        } else {
-            throw new RemoteServiceException("租赁商品支付场景未定义");
-        }
-        return wechatLogic.payment(leaseOrderId, payValue, miniPay != null && miniPay? openId : wechat.getUser().getOpenId(), "N", ip, order.getCompanyWechatId(), miniPay);
-    }
-
-    public BigDecimal computeRenewalAmount(String id, Date realEndDate) {
-        final LeaseOrderItem item = leaseOrderItemService.lambdaQuery()
-                .eq(LeaseOrderItem::getLeaseOrderId, id)
-                .last("limit 1")
-                .one();
-        Date orderDate = Objects.isNull(item.getRealEndDate()) ? item.getEndDate() : item.getRealEndDate();
-
-        // 续租总租金=数量*续租单价/30天*（实际到期日期-到期日期）
-        long leaseDay = DateUtil.betweenDay(orderDate, realEndDate, true);
-
-        BigDecimal amount = BigDecimal.valueOf(item.getQty())
-                .multiply(item.getRenewalPrice())
-                .divide(BigDecimal.valueOf(30L), 2, BigDecimal.ROUND_HALF_UP)
-                .multiply(BigDecimal.valueOf(leaseDay));
-
-        amount = amount.compareTo(BigDecimal.ZERO) <= 0 ? item.getRenewalPrice().multiply(BigDecimal.valueOf(leaseDay)) : amount;
-
-        return amount.compareTo(BigDecimal.ZERO) <= 0 ? item.getRenewalPrice() : amount;
-    }
-
-    public LeaseOrderBean detail(String id) {
-        final LeaseOrder order = leaseOrderService.getById(id);
-        LeaseOrderBean bean = new LeaseOrderBean();
-        BeanUtils.copyProperties(order, bean);
-
-        final List<LeaseOrderItem> items = leaseOrderItemService.lambdaQuery()
-                .eq(LeaseOrderItem::getLeaseOrderId, id)
-                .list();
-        bean.setItems(items);
-
-        final List<LeaseOrderPayRecord> records = leaseOrderPayRecordService.lambdaQuery()
-                .eq(LeaseOrderPayRecord::getLeaseOrderId, id)
-                .eq(LeaseOrderPayRecord::getPayStatus, true)
-                .list();
-        if (CollectionUtil.isNotEmpty(records)) {
-            final List<LeaseOrderPayRecord> payRecords = records.stream().filter(v -> v.getOrderType().equals("FIRST")).collect(Collectors.toList());
-            if (CollectionUtil.isNotEmpty(payRecords)) {
-                bean.setRecord(payRecords.get(0));
-            }
-            final List<LeaseOrderPayRecord> recordList = records.stream().filter(v -> !v.getOrderType().equals("FIRST")).collect(Collectors.toList());
-            bean.setRecords(recordList);
-        }
-
-        return bean;
-    }
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/OrderLogic.java

@@ -380,9 +380,7 @@ public class OrderLogic {
         payDetail.setId(orderInfo.getOrderId());
 
         if (!StringUtils.equals(orderBuyBean.getPayTypeId(), PayTypeEnum.STORE.getKey())) {
-            payDetail = wechatLogic.payment(orderInfo.getOrderId(), orderInfo.getPayAmount(),
-                    orderBuyBean.getMiniPay() != null && orderBuyBean.getMiniPay() ? orderBuyBean.getOpenId() : user.getOpenId(),
-                    profitSharingFlag, ip, user.getCompanyWechatId(), orderBuyBean.getMiniPay());
+            // 在线支付逻辑
 
         } else {
             payDetail.setIsPay(false);
@@ -447,16 +445,6 @@ public class OrderLogic {
 
         if (StringUtils.isNotBlank(userId) && !userId.equals(orderInfo.getUserId())) {
             User user = userService.getById(userId);
-            if (user.getType().equals(UserTypeEnum.SERVICE.toString())) {
-                throw new RemoteServiceException("业务员不可替业务员下单");
-            }
-
-            //绑定客户关系
-            if (StringUtils.isBlank(user.getServiceId())) {
-                user.setServiceId(orderInfo.getUserId());
-                user.setServiceTime(new Date());
-                user.updateById();
-            }
 
             if (!orderInfo.getOrderStatus().equals(OrderStatusEnum.NOPAY.toString())) {
                 throw new RemoteServiceException("订单已超时取消或已支付成功");
@@ -470,27 +458,17 @@ public class OrderLogic {
 
         }
 
-        if ( miniPay != null && miniPay) {
-            orderInfoService.lambdaUpdate()
-                    .eq(OrderInfo::getOrderId, orderId)
-                    .set(OrderInfo::getSource, OrderInfoSourceEnum.A.getRemark())
-                    .update();
-        }else {
-            orderInfoService.lambdaUpdate()
-                    .eq(OrderInfo::getOrderId, orderId)
-                    .set(OrderInfo::getSource, OrderInfoSourceEnum.B.getRemark())
-                    .update();
-        }
+        orderInfoService.lambdaUpdate()
+                .eq(OrderInfo::getOrderId, orderId)
+                .set(OrderInfo::getSource, OrderInfoSourceEnum.A.getRemark())
+                .update();
+
 
         orderInfoService.lambdaUpdate().set(OrderInfo::getOrderId,newOrderId).eq(OrderInfo::getOrderId,orderId).update();
         orderDetailService.lambdaUpdate().set(OrderDetail::getOrderId,newOrderId).eq(OrderDetail::getOrderId,orderId).update();
 
-        User user = userService.getById(orderInfo.getUserId());
-        String profitSharingFlag = "N";
-        BigDecimal zero = new BigDecimal("0.00");
-
-        PayDetail payDetail = wechatLogic.payment(newOrderId, orderInfo.getPayAmount(),miniPay != null && miniPay?openId:user.getOpenId(),
-                profitSharingFlag, ip,user.getCompanyWechatId(),miniPay);
+        // 在线支付
+        PayDetail payDetail = new PayDetail();
         return payDetail;
     }
 

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/user/PayLogic.java

@@ -4,7 +4,6 @@ import com.gree.mall.miniapp.commonmapper.SoldNumMapper;
 import com.gree.mall.miniapp.enums.*;
 import com.gree.mall.miniapp.logic.acitivy.PromotionLuckDrawLogic;
 import com.gree.mall.miniapp.logic.common.outside.WechatLogic;
-import com.gree.mall.miniapp.logic.order.LeaseOrderLogic;
 import com.gree.mall.miniapp.plus.entity.*;
 import com.gree.mall.miniapp.plus.service.*;
 import lombok.extern.slf4j.Slf4j;
@@ -19,7 +18,6 @@ import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -64,8 +62,6 @@ public class PayLogic {
     LeaseOrderItemService leaseOrderItemService;
     @Resource
     LeaseOrderPayRecordService leaseOrderPayRecordService;
-    @Resource
-    LeaseOrderLogic leaseOrderLogic;
 
     @Autowired
     CarouselMapService carouselMapService;

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/user/UserLogic.java

@@ -62,8 +62,6 @@ public class UserLogic {
     ShoppingCartLogic shoppingCartLogic;
     @Autowired
     CouponLogic couponLogic;
-    //    @Autowired
-//    WorkWechatLogic workWechatLogic;
     @Autowired
     RedisLockRegistry redisLockRegistry;
     @Autowired
@@ -118,10 +116,6 @@ public class UserLogic {
      * @throws InterruptedException
      */
     public UserWxBean addUser(String code, String phoneCode, String serviceId, String mpOpenId, HttpServletRequest request) throws RemoteServiceException, InterruptedException, WxErrorException {
-        CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat(request);
-        //WxMaService maService = wechatLogic.getMaService(currentCompanyWechat.getCurrentCompanyWechatId());
-
-        //WxMaJscode2SessionResult result = maService.jsCode2SessionInfo(code);
         WechatOpenBean result = wechatLogic.getAuth(code, phoneCode);
         String openId = result.getOpenid();
         String sessionKey = result.getSessionKey();
@@ -146,7 +140,6 @@ public class UserLogic {
             //如果用户不存在则新注册
             User user = userService.lambdaQuery()
                     .eq(User::getOpenId, openId)
-                    .eq(User::getCompanyWechatId, currentCompanyWechat.getCompanyWechatId())
                     .one();
             if (user == null) {
 
@@ -154,22 +147,14 @@ public class UserLogic {
                 user.setUserId(IdWorker.getIdStr());
                 user.setLastLoginTime(new Date());
                 user.setOpenId(openId);
-                user.setSessionKey(sessionKey);
-                if (StringUtils.isNotBlank(serviceId)) {
-                    user.setServiceId(serviceId);
-                    user.setServiceTime(new Date());
-                }
+
                 user.setLastLoginTime(new Date());
                 user.setCreateTime(new Date());
-                if (StringUtils.isNotBlank(mpOpenId)) {
-                    user.setMpOpenId(mpOpenId);
-                }
+
                 //授权手机号
                 if (StringUtils.isNotBlank(mobile)) {
                     user.setMobile(mobile);
                 }
-                user.setCompanyWechatId(currentCompanyWechat.getCompanyWechatId());
-                user.setCompanyName(currentCompanyWechat.getCompanyName());
                 userService.save(user);
 
             } else {
@@ -178,16 +163,8 @@ public class UserLogic {
                 if (!user.getStatus()) {
                     throw new RemoteServiceException("用户已被冻结");
                 }
-                user.setUnionId(unionId);
-                user.setSessionKey(sessionKey);
                 user.setLastLoginTime(new Date());
-                if (StringUtils.isBlank(user.getServiceId()) && StringUtils.isNotBlank(serviceId)) {
-                    user.setServiceId(serviceId);
-                    user.setServiceTime(new Date());
-                }
-                if (StringUtils.isNotBlank(mpOpenId)) {
-                    user.setMpOpenId(mpOpenId);
-                }
+
                 //授权手机号
                 if (StringUtils.isNotBlank(mobile)) {
                     user.setMobile(mobile);
@@ -228,23 +205,15 @@ public class UserLogic {
             //如果用户不存在则新注册
             User user = userService.lambdaQuery()
                     .eq(User::getOpenId, mpOpenId)
-                    .eq(User::getCompanyWechatId, currentCompanyWechat.getCompanyWechatId())
                     .one();
             if (user == null) {
                 user = new User();
                 user.setUserId(IdWorker.getIdStr());
                 user.setLastLoginTime(new Date());
                 user.setOpenId(mpOpenId);
-                user.setMpOpenId(mpOpenId);
-                user.setServiceId(serviceId);
-                user.setServiceTime(new Date());
                 user.setLastLoginTime(new Date());
                 user.setCreateTime(new Date());
-                if (StringUtils.isNotBlank(mpOpenId)) {
-                    user.setMpOpenId(mpOpenId);
-                }
-                user.setCompanyWechatId(currentCompanyWechat.getCompanyWechatId());
-                user.setCompanyName(currentCompanyWechat.getCompanyName());
+
                 userService.save(user);
             } else {
                 //如果用户存在，则判断是否为业务员，并更新相关信息
@@ -252,13 +221,7 @@ public class UserLogic {
                     throw new RemoteServiceException("用户已被冻结");
                 }
                 user.setLastLoginTime(new Date());
-                if (StringUtils.isBlank(user.getServiceId()) && StringUtils.isNotBlank(serviceId)) {
-                    user.setServiceId(serviceId);
-                    user.setServiceTime(new Date());
-                }
-                if (StringUtils.isNotBlank(mpOpenId)) {
-                    user.setMpOpenId(mpOpenId);
-                }
+
                 user.setOpenId(mpOpenId);
                 user.updateById();
             }
@@ -313,7 +276,6 @@ public class UserLogic {
 
             }
         }
-        user.setApplyType(userTypeEnum.getKey());
         user.setType(userTypeEnum.getKey());
         user.updateById();
     }
@@ -325,10 +287,8 @@ public class UserLogic {
      */
     public void userTypeInit2(User user) {
         String mobile = user.getMobile();
-//        CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
         List<UserWait> list = userWaitService.lambdaQuery()
                 .eq(UserWait::getMobile, mobile)
-//                .eq(UserWait::getCompanyWechatId, currentCompanyWechat.getCurrentCompanyWechatId())
                 .eq(UserWait::getIsAdd, false)
                 .list();
         if (CollectionUtils.isEmpty(list)) {
@@ -343,33 +303,8 @@ public class UserLogic {
             if (StringUtils.isBlank(user.getIdCard())) {
                 user.setIdCard(userWait.getIdcard());
             }
-            //非师傅状态，只有有1个入驻师傅的就是师傅
-//            if (userWait.getUserType().equals(UserTypeEnum.WORKER.getKey())) {
-//
-//                userTypeEnum = UserTypeEnum.WORKER;
-//
-//                if (!user.getType().equals(UserTypeEnum.WORKER.getKey())) {
-//                    //新增网点师傅,先删后增
-//                    websitUserService.lambdaUpdate()
-//                            .eq(WebsitUser::getWebsitId, userWait.getWebsitId())
-//                            .eq(WebsitUser::getUserId, user.getUserId())
-//                            .remove();
-//
-//                    WebsitUser websitUser = new WebsitUser();
-//                    websitUser.setUserId(user.getUserId());
-//                    websitUser.setWebsitId(userWait.getWebsitId());
-//                    websitUser.setExamineStatus(ExamineStatusEnum.OK.getKey());
-//                    websitUser.setExamineTime(new Date());
-//                    websitUser.setExamineRemark("初始化");
-//                    websitUser.setBankAccount(userWait.getBankAccount());
-//                    websitUser.setWorkerNumber(userWait.getWorkerNumber());
-//                    websitUser.setCompanyWechatId(currentCompanyWechat.getCurrentCompanyWechatId());
-//                    websitUser.setCompanyWechatName(currentCompanyWechat.getCompanyName());
-//                    websitUser.insert();
-//                }
-//            }
+
         }
-        user.setApplyType(userTypeEnum.getKey());
         user.setType(userTypeEnum.getKey());
         user.updateById();
 
@@ -379,168 +314,6 @@ public class UserLogic {
                 .update();
     }
 
-//    public User userToService(User user,CurrentCompanyWechat currentCompanyWechat){
-//        //判断该手机号是否为业务员
-//        if (StringUtils.isNotBlank(user.getMobile())) {
-//            List<EnterpriseWechatWorker> list = enterpriseWechatWorkerService.lambdaQuery()
-//                    .eq(EnterpriseWechatWorker::getMobile, user.getMobile())
-//                    .eq(EnterpriseWechatWorker::getCorpId,currentCompanyWechat.getCorpId())
-//                    .list();
-//
-//            if (!CollectionUtils.isEmpty(list)) {
-//                String workUserId = list.get(0).getWechatUserId();
-//                Integer count = userService.lambdaQuery()
-//                        .eq(User::getWorkUserId, workUserId)
-//                        .eq(User::getType, UserTypeEnum.SERVICE.toString())
-//                        .count();
-//                if(count<1){
-//                    user.setType(UserTypeEnum.SERVICE.toString());
-//                    user.setWorkName(list.get(0).getName());
-//                    user.setWorkUserId(workUserId);
-//                    user.setPosition(list.get(0).getPosition());
-//                    user.setWorkPhone(list.get(0).getMobile());
-//                    user.setWorkQrcode(list.get(0).getQrCode());
-//                    user.setCompanyWechatId(currentCompanyWechat.getCompanyWechatId());
-//                    user.setCompanyName(currentCompanyWechat.getCompanyName());
-//                }
-//            }
-//        }
-//        return user;
-//    }
-
-    /**
-     * 企业微信里授权的场景
-     *
-     * @param code
-     * @param serviceId
-     * @return
-     * @throws WxErrorException
-     * @throws RemoteServiceException
-     * @throws InterruptedException
-     */
-//    @Transactional
-//    public UserWxBean addWorkUser(String code, String serviceId,HttpServletRequest request) throws RemoteServiceException, InterruptedException {
-//        CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat(request);
-//        //企业微信里拉取微信授权
-//        if (StringUtils.isNotBlank(serviceId)) {
-//            User user = userService.getById(serviceId);
-//            Map<String, Object> returnMap = wechatLogic.authToken(code,currentCompanyWechat);
-//            String openId = (String) returnMap.get("openid");
-//            String sessionKey = (String) returnMap.get("session_key");
-//            //删掉可能存在的openid数据
-//            userService.lambdaUpdate()
-//                    .eq(User::getOpenId, openId)
-//                    .eq(User::getCompanyWechatId,currentCompanyWechat.getCompanyWechatId())
-//                    .remove();
-//            //微信授权,二次绑定微信openid
-//            user.setOpenId(openId);
-//            user.setSessionKey(sessionKey);
-//            user.updateById();
-//            return this.supplyUser(user);
-//        }
-//
-//        //企业微信进入
-//        WxCpMaJsCode2SessionResult wxCpMaJsCode2SessionResult = workWechatLogic.jsCode2Session(code,currentCompanyWechat);
-//
-//        String workUserId = wxCpMaJsCode2SessionResult.getUserId();
-//        String sessionKey = wxCpMaJsCode2SessionResult.getSessionKey();
-//
-//        String key = Constant.RedisPrefix.LOCK_AUTH + ":" + workUserId;
-//        Lock obtain = redisLockRegistry.obtain(key);
-//        if (!obtain.tryLock(2, TimeUnit.SECONDS)) {
-//            log.error("请勿重复授权");
-//            return null;
-//        }
-//        try {
-//
-//            User user = userService.lambdaQuery()
-//                    .eq(User::getWorkUserId, workUserId)
-//                    .eq(User::getStatus,true)
-//                    .eq(User::getCompanyWechatId,currentCompanyWechat.getCompanyWechatId())
-//                    .one();
-//            if (user != null) {
-//                user.setWorkSessionKey(sessionKey);
-//                user.setLastLoginTime(new Date());
-//                user.updateById();
-//                return this.supplyUser(user);
-//            }
-//            //获取企业微信个人信息
-//            WxCpUser wxCpUser = workWechatLogic.getUser(workUserId,currentCompanyWechat);
-//            if (wxCpUser == null) {
-//                List<EnterpriseWechatWorker> list = enterpriseWechatWorkerService.lambdaQuery()
-//                        .eq(EnterpriseWechatWorker::getWechatUserId, workUserId)
-//                        .eq(EnterpriseWechatWorker::getCorpId,currentCompanyWechat.getCorpId()).list();
-//                if (list.size() > 0) {
-//                    EnterpriseWechatWorker enterpriseWechatWorker = list.get(0);
-//                    wxCpUser = new WxCpUser();
-//                    wxCpUser.setMobile(enterpriseWechatWorker.getMobile());
-//                    wxCpUser.setGender(Gender.UNDEFINED);
-//                    wxCpUser.setAvatar(enterpriseWechatWorker.getQrCode());
-//                    wxCpUser.setName(enterpriseWechatWorker.getName());
-//                    wxCpUser.setStatus(1);
-//                    wxCpUser.setQrCode(enterpriseWechatWorker.getQrCode());
-//                }
-//            }
-//            if (wxCpUser == null) {
-//                log.error("企业微信授权失败，workUserId:{}", workUserId);
-//                throw new RemoteServiceException("授权失败，请联系相关人员");
-//            }
-//
-//            //查询是否能根据手机号查询到微信用户
-//            if(StringUtils.isNotBlank(wxCpUser.getMobile())){
-//                user = this.getUserByMobile(wxCpUser.getMobile(),currentCompanyWechat.getCompanyWechatId());
-//            }
-//            Integer count = userService.lambdaQuery()
-//                    .eq(User::getWorkUserId, workUserId)
-//                    .eq(User::getType, UserTypeEnum.SERVICE.toString())
-//                    .eq(User::getCompanyWechatId,currentCompanyWechat.getCompanyWechatId())
-//                    .count();
-//            if (user == null) {
-//                user = new User();
-//                user.setMobile(wxCpUser.getMobile());
-//                user.setNickName(wxCpUser.getName());
-//                if(wxCpUser.getGender() != null) {
-//                    user.setSex(wxCpUser.getGender().getGenderName());
-//                }
-//                user.setAvatar(wxCpUser.getAvatar());
-//                user.setStatus(wxCpUser.getStatus() == 1);
-//
-//                if (count < 1) {
-//                    user.setWorkName(wxCpUser.getName());
-//                    user.setWorkPhone(wxCpUser.getMobile());
-//                    user.setWorkUserId(workUserId);
-//                    user.setType(UserTypeEnum.SERVICE.toString());
-//                    user.setPosition(wxCpUser.getPosition());
-//                    user.setWorkQrcode(wxCpUser.getQrCode());
-//                    user.setWorkSessionKey(sessionKey);
-//                }
-//                user.setLastLoginTime(new Date());
-//                user.setCreateTime(new Date());
-//                user.setCompanyWechatId(currentCompanyWechat.getCompanyWechatId());
-//                user.setCompanyName(currentCompanyWechat.getCompanyName());
-//                user.insert();
-//            } else {
-//                if (!user.getStatus()) {
-//                    throw new RemoteServiceException("用户已被冻结");
-//                }
-//                if (count < 1) {
-//                    user.setWorkUserId(workUserId);
-//                    user.setWorkName(wxCpUser.getName());
-//                    user.setWorkPhone(wxCpUser.getMobile());
-//                    user.setWorkQrcode(wxCpUser.getQrCode());
-//                    user.setType(UserTypeEnum.SERVICE.toString());
-//                    user.setWorkSessionKey(sessionKey);
-//                }
-//                user.setLastLoginTime(new Date());
-//                user.updateById();
-//            }
-//            return this.supplyUser(user);
-//        } finally {
-//            obtain.unlock();
-//        }
-//    }
-
-
     /**
      * 返回小程序用户登录需要的信息
      *
@@ -583,42 +356,13 @@ public class UserLogic {
         if (StringUtils.isNotBlank(serviceId)) {
             service = userService.getById(serviceId);
         } else {
-            service = userService.lambdaQuery().eq(User::getMiniOpenId, serviceOpenId).last("limit 1").one();
+            service = userService.lambdaQuery().last("limit 1").one();
         }
         if (service == null) {
             return;
         }
-        //绑定业务员
-        if (user.getType().equals(UserTypeEnum.GENERAL.toString())
-                && (service.getType().equals(UserTypeEnum.SERVICE.toString()) || service.getType().equals(UserTypeEnum.WORKER.toString()))) {
-            user.setServiceId(serviceId);
-            user.setServiceTime(new Date());
-        }
-        //第一个业务员
-//        if(StringUtils.isBlank(user.getFirstServiceId())){
-//            user.setFirstServiceId(serviceId);
-//            user.setFirstServiceTime(new Date());
-//        }
-
-        //判断是否为团长
-        if (!user.getPromotionGroupLeader()) {
-            if (service.getPromotionGroupLeader()) {
-                user.setPromotionGroupUserId(serviceId);
-            } else {
-                String promotionGroupUserId = service.getPromotionGroupUserId();
-                user.setPromotionGroupUserId(promotionGroupUserId);
-            }
-        }
 
         user.updateById();
-
-    }
-
-    public User getUserByMobile(String mobile, String companyWechatId) {
-        return userService.lambdaQuery()
-                .eq(User::getMobile, mobile)
-                .eq(User::getStatus, true)
-                .eq(User::getCompanyWechatId, companyWechatId).one();
     }
 
     /**
@@ -634,17 +378,11 @@ public class UserLogic {
         if (user == null) {
             throw new RemoteServiceException("用户不存在");
         }
-        if (StringUtils.isNotBlank(user.getBindQrcode())) {
-            return user.getBindQrcode();
-        }
+
         String qrcode = null;
         try {
             qrcode = wechatLogic.getQrcode(QrCodeEnum.BIND.toString().toLowerCase(Locale.ROOT),
                     user.getUserId(), user.getUserId(), currentCompanyWechat.getCompanyWechatId());
-            if (StringUtils.isNotBlank(qrcode)) {
-                user.setBindQrcode(qrcode);
-                userService.updateById(user);
-            }
         } catch (Exception e) {
             log.error("获取绑定业务员小程序码失败", e);
         }
@@ -714,93 +452,6 @@ public class UserLogic {
         return list;
     }
 
-
-    /**
-     * 解除绑定
-     */
-    public void unBind() {
-        //满30天自动解绑
-        Date timeByDay = DateUtils.getTimeByDay(new Date(), -30);
-        userService.lambdaUpdate().set(User::getServiceId, "").set(User::getServiceTime, null)
-                .ne(User::getServiceId, "")
-                .lt(User::getServiceTime, timeByDay)
-                .eq(User::getType, UserTypeEnum.GENERAL.toString())
-                .update();
-    }
-
-
-    //手机号码授权
-//    @Transactional
-//    public UserWxBean getWxMobile(String iv, String encryptedData, String userId,HttpServletRequest request) throws Exception {
-//        CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat(request);
-//        UserWxBean userWxBean = new UserWxBean();
-//        User user = this.userService.getById(userId);
-//        if (null == user) {
-//            throw new RemoteServiceException("用户信息为空" + userId);
-//        }
-//        WxMaService maService = wechatLogic.getMaService(currentCompanyWechat.getCompanyWechatId());
-//        WxMaPhoneNumberInfo phoneNoInfo = maService.getUserService().getPhoneNoInfo(user.getSessionKey(), encryptedData, iv);
-//        String mobile = phoneNoInfo.getPhoneNumber();
-//        if(StringUtils.isBlank(mobile)){
-//            throw new RemoteServiceException("手机号授权失败");
-//        }
-////        byte[] resultByte = AesCbcUtil.decrypt(Base64.decodeBase64(encryptedData), Base64.decodeBase64(user.getSessionKey()), Base64.decodeBase64(iv));
-////        if (null == resultByte || resultByte.length < 0) {
-////            throw new RemoteServiceException("手机号授权失败");
-////        }
-////        String userInfo = new String(resultByte, "UTF-8");
-////        Map<String, Object> map = Utils.stringToMap(userInfo);
-////        log.info("授权手机号response:{}", JSONObject.toJSONString(map));
-////        //获取手机号码
-////        String mobile = String.valueOf(map.get("phoneNumber"));
-//
-//        //判断该手机号是否为业务员
-////        List<EnterpriseWechatWorker> list = enterpriseWechatWorkerService.lambdaQuery()
-////                .eq(EnterpriseWechatWorker::getMobile, mobile)
-////                .eq(EnterpriseWechatWorker::getCorpId,currentCompanyWechat.getCorpId())
-////                .list();
-//
-//        //根据手机号查询是否存在企业微信用户
-//        User workUser = this.getUserByMobile(mobile,currentCompanyWechat.getCompanyWechatId());
-//        if (workUser == null) {
-//            //企业微信用户为空，则直接授权手机号。并根据手机号判断是否存在于微信成员表如果存在则为业务员
-//            user.setMobile(mobile);
-//            if (list.size() > 0) {
-//                String workUserId = list.get(0).getWechatUserId();
-//                Integer count = userService.lambdaQuery()
-//                        .eq(User::getWorkUserId, workUserId)
-//                        .eq(User::getType, UserTypeEnum.SERVICE.toString())
-//                        .eq(User::getCompanyWechatId,currentCompanyWechat.getCompanyWechatId())
-//                        .count();
-//                if (count < 1) {
-//                    user.setType(UserTypeEnum.SERVICE.toString());
-//                    user.setWorkName(list.get(0).getName());
-//                    user.setWorkUserId(workUserId);
-//                    user.setWorkPhone(list.get(0).getMobile());
-//                    user.setWorkQrcode(list.get(0).getQrCode());
-//                    user.setPosition(list.get(0).getPosition());
-//                }
-//            }
-//            user.updateById();
-//
-//            String token = JwtUtils.createJWT(user.getUserId(), user.getOpenId(), 7 * 24 * 60 * 60 * 1000);
-//            BeanUtils.copyProperties(user, userWxBean);
-//            userWxBean.setToken(token);
-//
-//        } else {
-//            //企业微信不为空，则将数据绑定到企业微信,并删除授权openid的用户数据
-//            workUser.setOpenId(user.getOpenId());
-//            workUser.updateById();
-//            user.deleteById();
-//
-//            String token = JwtUtils.createJWT(workUser.getUserId(), workUser.getOpenId(), 7 * 24 * 60 * 60 * 1000);
-//            BeanUtils.copyProperties(workUser, userWxBean);
-//            userWxBean.setToken(token);
-//        }
-//        return userWxBean;
-//    }
-
-
     //保存用户信息
     public User saveUserInfo(String userId, String nickName, String sex, String avatarUrl, String country, String province, String city) {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
@@ -836,14 +487,13 @@ public class UserLogic {
         UserWxBean userWxBean = new UserWxBean();
         BeanUtils.copyProperties(user, userWxBean);
         userWxBean.setShoppingCartNums(shoppingCartLogic.total(userWxBean.getUserId(), null));
-        //userWxBean.setServiceWorkerBean(userInfoMapper.queryWebsit(user.getUserId()));
         userWxBean.setCompanyWechatMobile(currentCompanyWechat.getLinkPhone());
         userWxBean.setModuleMaterialPart(currentCompanyWechat.getModuleMaterialPart());
         userWxBean.setModuleWb(currentCompanyWechat.getModuleWb());
         userWxBean.setModuleYb(currentCompanyWechat.getModuleYb());
         userWxBean.setModuleEs(currentCompanyWechat.getModuleEs());
         userWxBean.setStorePay(currentCompanyWechat.getStorePay());
-        final AdminCompanyWechat companyWechat = adminCompanyWechatService.getById(userWxBean.getCompanyWechatId());
+        final AdminCompanyWechat companyWechat = adminCompanyWechatService.list().get(0);
         if (Objects.nonNull(companyWechat)) {
             userWxBean.setIsShowLease(companyWechat.getModuleZl());
             userWxBean.setCompanyType(companyWechat.getCompanyType());
@@ -862,8 +512,6 @@ public class UserLogic {
         ) {
             UserLog userLog = new UserLog();
             userLog.setType("LOGIN");
-            userLog.setCompanyWechatId(user.getCompanyWechatId());
-            userLog.setCompanyName(user.getCompanyName());
             userLog.setUserId(user.getUserId());
             userLog.setLoginType(IsYesNoEnum.NO.getKey());
             userLog.setMiniType(user.getType());
@@ -878,8 +526,6 @@ public class UserLogic {
 
             UserLog userLog = new UserLog();
             userLog.setType("SEE");
-            userLog.setCompanyWechatId(user.getCompanyWechatId());
-            userLog.setCompanyName(user.getCompanyName());
             userLog.setUserId(user.getUserId());
             userLog.setLoginType(IsYesNoEnum.NO.getKey());
             userLog.setMiniType(user.getType());
@@ -925,13 +571,7 @@ public class UserLogic {
         if (user == null) {
             return null;
         }
-//        return orderShareService.lambdaQuery()
-//                .eq(OrderShare::getOpenId,user.getOpenId())
-//                .ne(OrderShare::getWorkUserId,"")
-//                .eq(StringUtils.isNotBlank(status),OrderShare::getStatus,status)
-//                .eq(OrderShare::getCompanyWechatId,user.getCompanyWechatId())
-//                .orderByDesc(OrderShare::getCreateTime)
-//                .page(new Page<>(pageNum, pageSize));
+
         return myProfitMapper.queryOrderShareList(new Page<>(pageNum, pageSize), user.getUserId(), status);
     }
 
@@ -946,7 +586,6 @@ public class UserLogic {
         //商城商品收益
         List<OrderShare> list1 = orderShareService.lambdaQuery()
                 .eq(OrderShare::getOpenId, user.getOpenId())
-                .eq(OrderShare::getCompanyWechatId, user.getCompanyWechatId())
                 .and(v -> v.eq(OrderShare::getWorkUserId, user.getUserId()))
                 .eq(OrderShare::getStatus, OrderShareStatusEnum.OVER.toString())
                 .list();
@@ -965,27 +604,6 @@ public class UserLogic {
         return sum1.add(sum2);
     }
 
-
-    /**
-     * 我的客户
-     */
-    public IPage<User> customerList(String userId, Integer pageNum, Integer pageSize) {
-        IPage<User> page = userService.lambdaQuery().eq(User::getServiceId, userId).page(new Page<>(pageNum, pageSize));
-        return page;
-    }
-
-    /**
-     * 我的经理
-     */
-    public User parentUser(String userId) {
-        User user = userService.getById(userId);
-        if (StringUtils.isNotBlank(user.getServiceId())) {
-            User parentUser = userService.getById(user.getServiceId());
-            return parentUser;
-        }
-        return null;
-    }
-
     /**
      * 新增用户访问记录
      */
@@ -1004,18 +622,6 @@ public class UserLogic {
     }
 
     /**
-     * 设置为默认网点
-     *
-     * @param websitId
-     */
-    public void defaultWebsit(String websitId) {
-        CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
-        userService.lambdaUpdate()
-                .set(User::getDefaultWebsitId, websitId)
-                .eq(User::getUserId, currentCompanyWechat.getUserId()).update();
-    }
-
-    /**
      * 我的统计
      */
     public MyCountBean myCount(String userId) {
@@ -1030,19 +636,19 @@ public class UserLogic {
         return myCountBean;
     }
 
-    public IPage<SettleMonthWagesWorkerBean> mySettle(Integer pageNum, Integer pageSize) {
+    public IPage<SettleMonthWagesWorkerBean> mySettle(String companyWechatId, Integer pageNum, Integer pageSize) {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
         User user = userService.getById(currentCompanyWechat.getUserId());
-        IPage<SettleMonthWagesWorkerBean> workerPage = commonMapper.queryUserSettle(new Page(pageNum, pageSize), user.getCompanyWechatId(), user.getNickName());
+        IPage<SettleMonthWagesWorkerBean> workerPage = commonMapper.queryUserSettle(new Page(pageNum, pageSize), companyWechatId, user.getNickName());
 
         return workerPage;
     }
 
-    public List<SettleExpenseItem> mySettleItem(String settleMonthWagesId) {
+    public List<SettleExpenseItem> mySettleItem(String companyWechatId, String settleMonthWagesId) {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
         User user = userService.getById(currentCompanyWechat.getUserId());
         final List<SettleExpenseItem> expenseItemList = settleExpenseItemService.lambdaQuery()
-                .eq(SettleExpenseItem::getCompanyWechatId, user.getCompanyWechatId())
+                .eq(SettleExpenseItem::getCompanyWechatId, companyWechatId)
                 .eq(SettleExpenseItem::getSettleMonthWagesId, settleMonthWagesId)
                 .and(v -> v.eq(SettleExpenseItem::getWorkerName1, user.getNickName())
                         .or()
@@ -1067,7 +673,6 @@ public class UserLogic {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
         User user = userService.getById(currentCompanyWechat.getUserId());
         return settleExpenseItemService.lambdaQuery()
-                .eq(SettleExpenseItem::getCompanyWechatId, user.getCompanyWechatId())
                 .eq(SettleExpenseItem::getId, id)
                 .one();
     }
@@ -1188,8 +793,6 @@ public class UserLogic {
         UserVisit userVisit = new UserVisit();
         userVisit.setUserId(userWxBean.getUserId());
         userVisit.setVisitTime(new Date());
-        userVisit.setCompanyWechatId(userWxBean.getCompanyWechatId());
-        userVisit.setCompanyName(userWxBean.getCompanyName());
         userVisit.insert();
     }
 

mall-server-api/src/main/java/com/gree/mall/manager/controller/member/MemberController.java

@@ -191,17 +191,6 @@ public class MemberController {
     }
 
 
-    @PostMapping("/batch/inner")
-    @ApiOperation(value = "批量设置或取消内部分销员-v2")
-    public ResponseHelper batchInner(
-            @ApiParam(value = "true=内部分销员 false=取消内部分销员") @RequestParam Boolean innerr,
-            @ApiParam(value = "用户id集合，逗号隔开") @RequestParam List<String> userIds
-    ) {
-        userLogic.batchInner(userIds, innerr);
-        return ResponseHelper.success();
-    }
-
-
     @PostMapping("/batch/type")
     @ApiOperation(value = "批量设置用户类型-v2")
     public ResponseHelper batchType(
@@ -212,17 +201,6 @@ public class MemberController {
     }
 
 
-    @PostMapping("/batch/es")
-    @ApiOperation(value = "批量设置师傅二手商品发布权限")
-    public ResponseHelper batchEs(
-            @ApiParam(value = "true=启用 false=禁用") @RequestParam Boolean isEs,
-            @ApiParam(value = "用户id集合，逗号隔开") @RequestParam List<String> userIds
-    ) {
-        userLogic.batchEs(userIds, isEs);
-        return ResponseHelper.success();
-    }
-
-
     @GetMapping("/list/page")
     @ApiOperation(value = "会员列表")
     public ResponseHelper<Page<User>> page(HttpServletRequest request,
@@ -256,17 +234,6 @@ public class MemberController {
     }
 
 
-    @PostMapping("/updateUserInnerStatus")
-    @ApiOperation(value = "修改会员内部人员状态")
-    public ResponseHelper updateUserInnerStatus(
-            @ApiParam(value = "用户id", required = true) @RequestParam String userId,
-            @ApiParam(value = "true:内部人员,false:非内部人员", required = true) @RequestParam Boolean inner)
-            throws RemoteServiceException {
-        userLogic.updateUserInnerStatus(userId, inner);
-        return ResponseHelper.success();
-    }
-
-
     @GetMapping("/downLoadUserInnerTimplate")
     @ApiOperation(value = "内部人员批量设置模板")
     public ResponseHelper downLoadUserInnerTimplate(HttpServletResponse response)
@@ -275,26 +242,6 @@ public class MemberController {
         return ResponseHelper.success();
     }
 
-    @PostMapping("/localUpdateInner")
-    @ApiOperation("/导入跟新内部人员状态")
-    public ResponseHelper<Void> localUpdateInner(
-            HttpServletRequest request,
-            @RequestParam("file") MultipartFile file
-    ) throws IOException {
-        userLogic.localUpdateInner(request, file);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/groupleader")
-    @ApiOperation("设置/取消团长")
-    public ResponseHelper groupleader(
-            @ApiParam(value = "用户id", required = true) @RequestParam String userId,
-            @ApiParam(value = "true=设置 false=取消", required = true) @RequestParam Boolean promotionGroupLeader
-    ) throws RemoteServiceException {
-        userLogic.groupleader(userId, promotionGroupLeader);
-        return ResponseHelper.success();
-    }
-
     @PostMapping("/status/update")
     @ApiOperation(value = "更改会员状态")
     public ResponseHelper change(

mall-server-api/src/main/java/com/gree/mall/manager/logic/big/BigLogic.java

@@ -128,7 +128,6 @@ public class BigLogic {
                 .count();
 
         Integer allWorker = userService.lambdaQuery().eq(User::getType, UserTypeEnum.WORKER.getKey())
-                .in(StringUtil.isEmpty(province) && !CollectionUtils.isEmpty(adminCompanyWechatList), User::getCompanyWechatId, companyIds)
                 .count();
 
 
@@ -145,8 +144,7 @@ public class BigLogic {
                 .between(UserLog::getCreateTime, DateUtil.offsetDay(DateUtil.beginOfDay(new Date()), -1), DateUtil.offsetDay(DateUtil.endOfDay(new Date()), -1)).count();
 
 
-        Integer allService = userService.lambdaQuery().eq(User::getType, UserTypeEnum.SERVICE.getKey())
-                .in(StringUtil.isEmpty(province) && !CollectionUtils.isEmpty(adminCompanyWechatList), User::getCompanyWechatId, companyIds).count();
+        Integer allService = userService.lambdaQuery().eq(User::getType, UserTypeEnum.SERVICE.getKey()).count();
 
 
         Integer allServiceLogin = userLogService.lambdaQuery().eq(UserLog::getLoginType, IsYesNoEnum.NO.getKey())
@@ -162,8 +160,7 @@ public class BigLogic {
                 .between(UserLog::getCreateTime, DateUtil.offsetDay(DateUtil.beginOfDay(new Date()), -1), DateUtil.offsetDay(DateUtil.endOfDay(new Date()), -1)).count();
 
 
-        Integer allUser = userService.lambdaQuery().eq(User::getType, UserTypeEnum.GENERAL.getKey())
-                .in(StringUtil.isEmpty(province) && !CollectionUtils.isEmpty(adminCompanyWechatList), User::getCompanyWechatId, companyIds).count();
+        Integer allUser = userService.lambdaQuery().eq(User::getType, UserTypeEnum.GENERAL.getKey()).count();
 
 
         Integer allUserLogin = userLogService.lambdaQuery().eq(UserLog::getLoginType, IsYesNoEnum.NO.getKey())
@@ -255,7 +252,6 @@ public class BigLogic {
                 .count();
 
         Integer allWorker = userService.lambdaQuery().eq(User::getType, UserTypeEnum.WORKER.getKey())
-                .in(!CollectionUtils.isEmpty(companyIds), User::getCompanyWechatId, companyIds)
                 .count();
 
 
@@ -272,8 +268,7 @@ public class BigLogic {
                 .between(UserLog::getCreateTime, DateUtil.offsetDay(DateUtil.beginOfDay(new Date()), -1), DateUtil.offsetDay(DateUtil.endOfDay(new Date()), -1)).count();
 
 
-        Integer allService = userService.lambdaQuery().eq(User::getType, UserTypeEnum.SERVICE.getKey())
-                .in(!CollectionUtils.isEmpty(companyIds), User::getCompanyWechatId, companyIds).count();
+        Integer allService = userService.lambdaQuery().eq(User::getType, UserTypeEnum.SERVICE.getKey()).count();
 
 
         Integer allServiceLogin = userLogService.lambdaQuery().eq(UserLog::getLoginType, IsYesNoEnum.NO.getKey())
@@ -289,8 +284,7 @@ public class BigLogic {
                 .between(UserLog::getCreateTime, DateUtil.offsetDay(DateUtil.beginOfDay(new Date()), -1), DateUtil.offsetDay(DateUtil.endOfDay(new Date()), -1)).count();
 
 
-        Integer allUser = userService.lambdaQuery().eq(User::getType, UserTypeEnum.GENERAL.getKey())
-                .in(!CollectionUtils.isEmpty(companyIds), User::getCompanyWechatId, companyIds).count();
+        Integer allUser = userService.lambdaQuery().eq(User::getType, UserTypeEnum.GENERAL.getKey()).count();
 
 
         Integer allUserLogin = userLogService.lambdaQuery().eq(UserLog::getLoginType, IsYesNoEnum.NO.getKey())

mall-server-api/src/main/java/com/gree/mall/manager/logic/coupon/CouponLogic.java

@@ -212,7 +212,6 @@ public class CouponLogic {
             List<UserCoupon> userCouponList = new ArrayList<>();
             List<User> userList = userService.lambdaQuery()
                     .eq(User::getType, UserTypeEnum.SERVICE.toString())
-                    .eq(User::getCompanyWechatId, adminUser.getCompanyWechatId())
                     .list();
             List<CouponUser> couponUserList = new ArrayList<>();
             for (User user : userList) {
@@ -238,7 +237,6 @@ public class CouponLogic {
             List<CouponUser> couponUserList = new ArrayList<>();
             List<User> userList = userService.lambdaQuery()
                     .eq(User::getType, UserTypeEnum.GENERAL.toString())
-                    .eq(User::getCompanyWechatId, adminUser.getCompanyWechatId())
                     .list();
             for (User user : userList) {
                 CouponUser couponUser = new CouponUser();
@@ -536,7 +534,6 @@ public class CouponLogic {
         List<String> companyWechatIds = adminUser.getCompanyWechatIds();
 
         return userService.lambdaQuery()
-                .in(CollectionUtils.isNotEmpty(companyWechatIds), User::getCompanyWechatId, companyWechatIds)
                 .eq(StringUtils.isNotBlank(type), User::getType, type)
                 .ge(registerTime != null, User::getCreateTime, registerTime)
                 .like(StringUtils.isNotBlank(tel), User::getMobile, tel.trim())
@@ -598,7 +595,7 @@ public class CouponLogic {
             if(StringUtils.isBlank(couponName) || StringUtils.isBlank(mobile) || amount == null || startTime == null || endTime == null){
                 throw new RemoteServiceException("请检查第"+i+"行数据是否完整");
             }
-            User user = userService.lambdaQuery().eq(User::getMobile, mobile).eq(User::getCompanyWechatId,companyWechatId).one();
+            User user = userService.lambdaQuery().eq(User::getMobile, mobile).one();
             if(user == null)
                 throw new RemoteServiceException("手机号为"+mobile+"的找不到对应用户");
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/order/OrderShareLogic.java

@@ -308,7 +308,8 @@ public class OrderShareLogic {
     public Integer getShareNum(String mobile){
         User user = userService.lambdaQuery()
                 .eq(User::getMobile, mobile)
-                .eq(User::getCompanyWechatId,Constant.GD_COMPANY_WECHAT_ID).last("limit 1").one();
+                .last("limit 1")
+                .one();
         if(user == null){
             return 0;
         }

mall-server-api/src/main/java/com/gree/mall/manager/logic/settle/WorkerSettleExpenseLogic.java

@@ -505,7 +505,6 @@ public class WorkerSettleExpenseLogic {
 
     private Map<String, User> getUserMap(String companyWechatId) {
         final List<User> userList = userService.lambdaQuery()
-                .eq(User::getCompanyWechatId, companyWechatId)
                 .eq(User::getType, UserTypeEnum.WORKER.getKey())
                 .list();
         if (CollectionUtil.isEmpty(userList)) {

mall-server-api/src/main/java/com/gree/mall/manager/logic/user/UserLogic.java

@@ -166,7 +166,6 @@ public class UserLogic {
         user.setIdCard(idCard);
         user.setIdCardImg(idCardImg);
         user.setBankAccount(bankAccount);
-        user.setIsEs(isEs);
         user.updateById();
 
         pgOrderWorkerService.lambdaUpdate().eq(PgOrderWorker::getWorkerNumber,workerNumber)
@@ -250,27 +249,6 @@ public class UserLogic {
     }
 
 
-    /**
-     * 批量设置取消内部分销员
-     *
-     * @param userIds
-     * @param innerr
-     */
-    public void batchInner(List<String> userIds, Boolean innerr) {
-        userService.lambdaUpdate().set(User::getInnerr, innerr).in(User::getUserId, userIds).update();
-    }
-
-
-    /**
-     * 批量设置二手商品发布权限
-     *
-     * @param userIds
-     */
-    public void batchEs(List<String> userIds, Boolean isEs) {
-        userService.lambdaUpdate().set(User::getIsEs, isEs).in(User::getUserId, userIds).update();
-    }
-
-
     @Transactional
     public void batchType(UserApplyBean userApplyBean) {
 
@@ -301,7 +279,6 @@ public class UserLogic {
                 .set(User::getExamineTime, new Date())
                 .set(User::getExamineBy, adminUser.getNickName())
                 .set(User::getExamineRemark, "系统手动配置")
-                .set(User::getApplyType, type.getKey())
                 .set(User::getType, type.getKey())
                 .set(StringUtils.isNotBlank(idCard), User::getIdCard, idCard)
                 .set(StringUtils.isNotBlank(idCardImg), User::getIdCardImg, idCardImg)
@@ -346,12 +323,7 @@ public class UserLogic {
 
         LambdaQueryWrapper<User> memberLambdaQueryWrapper = new LambdaQueryWrapper<>();
         memberLambdaQueryWrapper
-                .in(CollectionUtils.isNotEmpty(companyWechatIds), User::getCompanyWechatId, companyWechatIds)
-                .eq(isExchangeCode != null, User::getIsExchangeCode, isExchangeCode)
-                .eq(promotionGroupLeader != null, User::getPromotionGroupLeader, promotionGroupLeader)
                 .eq(StringUtils.isNotBlank(type), User::getType, type)
-                .eq(innerr != null, User::getInnerr, innerr)
-                // .in(!(adminWebsitBean.getType() && org.apache.commons.lang3.StringUtils.isBlank(websitId)), User::getWebsitNumber, websitNoList)
                 .between(StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime), User::getCreateTime, startTime, endTime)
                 .and(v -> v.ne(User::getMobile, ""))
                 .and(StringUtils.isNotBlank(keyword),
@@ -391,64 +363,6 @@ public class UserLogic {
     }
 
     /**
-     * 修改会员内部人员状态
-     */
-    public void updateUserInnerStatus(String userId, Boolean inner) {
-        Integer count = userService.lambdaQuery()
-                .eq(User::getUserId, userId)
-                .eq(User::getType, UserTypeEnum.SERVICE)
-                .count();
-        if (count == 0) {
-            throw new RemoteServiceException("只有业务员才能成为内部人员");
-        }
-        userService.lambdaUpdate()
-                .set(User::getInnerr, inner)
-                .eq(User::getUserId, userId)
-                .eq(User::getType, UserTypeEnum.SERVICE)
-                .update();
-    }
-
-    /**
-     * 导入跟新内部人员状态
-     */
-    public void localUpdateInner(HttpServletRequest request, MultipartFile multipartFile) throws IOException {
-        String loginCompanyWechatId = commonLogic.getAdminUser(request).getCompanyWechatId();
-        if (StringUtils.isBlank(loginCompanyWechatId)) {
-            throw new RemoteServiceException("非租户账号不可操作当前信息");
-        }
-
-        List<Object> objects = ExcelUtils.importExcel(multipartFile);
-        List<String> phoneList = new ArrayList<>();
-        for (int i = 0; i < objects.size(); i++) {
-            phoneList.add(((List<String>) objects.get(i)).get(0));
-        }
-
-        userService.lambdaUpdate()
-                .set(User::getInnerr, true)
-                .in(User::getMobile, phoneList)
-                .eq(User::getCompanyWechatId, loginCompanyWechatId)
-                .eq(User::getType, UserTypeEnum.SERVICE)
-                .update();
-    }
-
-
-    /**
-     * 设置/取消团长
-     */
-    @Transactional
-    public void groupleader(String userId, Boolean promotionGroupLeader) {
-        User user = userService.getById(userId);
-        if (user == null) {
-            throw new RemoteServiceException("用户不存在");
-        }
-        user.setUserId(userId);
-        user.setPromotionGroupLeader(promotionGroupLeader);
-        user.setPromotionGroupUserId(userId);
-        user.updateById();
-
-    }
-
-    /**
      * 用户详情
      */
     public UserWxBean detail(String userId) {
@@ -457,33 +371,9 @@ public class UserLogic {
         UserWxBean userWxBean = new UserWxBean();
         BeanUtils.copyProperties(user, userWxBean);
 
-//        AdminCompanyWechat adminCompanyWechat = commonLogic.getAdminCompanyWechat(user.getCompanyWechatId());
-
-        //查询客户数
-        Integer count = userService.lambdaQuery().eq(User::getServiceId, userId).count();
-
-        userWxBean.setCustomerNums(count);
+        userWxBean.setCustomerNums(0);
         userWxBean.setTotalAmount(orderShareLogic.totalAmount(userId));
 
-//        if (user.getType().equals(UserTypeEnum.SERVICE.toString())) {
-//            EnterpriseWechatWorker worker = enterpriseWechatWorkerService.lambdaQuery()
-//                    .eq(EnterpriseWechatWorker::getWechatUserId, userWxBean.getWorkUserId())
-//                    .eq(EnterpriseWechatWorker::getCorpId,adminCompanyWechat.getCorpId())
-//                    .one();
-//            if (worker != null) {
-//                userWxBean.setPosition(worker.getPosition());
-//                userWxBean.setWorkerName(worker.getName());
-//                userWxBean.setWorkerPhone(worker.getMobile());
-//            }
-//        }
-        if (StringUtils.isNotBlank(user.getServiceId())) {
-            User service = userService.getById(user.getServiceId());
-            if (service != null) {
-                userWxBean.setServiceName(service.getNickName());
-                userWxBean.setServicePhone(service.getMobile());
-            }
-        }
-
 
         return userWxBean;
     }

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseExcelLogic.java

@@ -782,7 +782,7 @@ public class OrderBaseExcelLogic {
      * @return
      */
     public Map<String, User> getWorkers(String companyWechatId) {
-        List<User> workers = userService.lambdaQuery().eq(User::getCompanyWechatId, companyWechatId).ne(User::getMobile, "")
+        List<User> workers = userService.lambdaQuery().ne(User::getMobile, "")
                 .eq(User::getType, UserTypeEnum.WORKER.getKey()).list();
         Map<String, User> workerMap = workers.stream().collect(Collectors.toMap(User::getMobile, Function.identity()));
         return workerMap;