no message

src/main/java/com/gree/mall/manager/bean/admin/AdminUserCom.java

@@ -1,7 +1,6 @@
 package com.gree.mall.manager.bean.admin;
 
 import com.gree.mall.manager.bean.admin.reqDto.AdminUserPermissions;
-import com.gree.mall.manager.plus.entity.AdminCompanyWechat;
 import com.gree.mall.manager.plus.entity.AdminUser;
 import com.gree.mall.manager.plus.entity.AdminUserPermissionsRela;
 import com.gree.mall.manager.plus.entity.AdminWebsit;
@@ -24,18 +23,6 @@ public class AdminUserCom extends AdminUser {
     @ApiModelProperty("部门集合")
     private List<String> adminDeptIds;
 
-    @ApiModelProperty("只读帐号(没有逻辑)")
-    private Boolean onlyRead = false;
-
-    @ApiModelProperty("当前登录人企业微信id(没有注入值)")
-    private String loginCompanyWechatId;
-
-    @ApiModelProperty("当前登录人企业名称(没有注入值)")
-    private String loginCompanyName;
-
-    @ApiModelProperty("当前登录人所使用的商户配置(没有注入值)")
-    private AdminCompanyWechat adminCompanyWechat;
-
     @ApiModelProperty("商家")
     private AdminWebsit adminWebsit;
 

src/main/java/com/gree/mall/manager/bean/common/SysDictCompanyVO.java

@@ -40,5 +40,5 @@ public class SysDictCompanyVO {
 
     @ZfireField(hide = true)
     @ApiModelProperty("所属商户id")
-    private String  companyWechatId;
+    private String  companyId;
 }

src/main/java/com/gree/mall/manager/commonmapper/AdminMapper.java

@@ -42,21 +42,21 @@ public interface AdminMapper {
      */
     Page<AdminUser> getAdminUser(IPage page,
                                   @Param("roleId") String roleId, @Param("status")Boolean status,
-                                  @Param("userName")String userName, @Param("companyWechatIds")List<String> companyWechatIds);
+                                  @Param("userName")String userName, @Param("companyIds")List<String> companyIds);
 
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     IPage<AdminDeptWebsitVO> list(Page page, @Param("ex") ZfireParamBean zfireParam);
 
     @Select({ "call batch_update_company_wechat_name("
-            + "#{companyWechatId,mode=IN,jdbcType=VARCHAR},"
-            + "#{companyWechatName,mode=IN,jdbcType=VARCHAR})"
+            + "#{companyId,mode=IN,jdbcType=VARCHAR},"
+            + "#{companyName,mode=IN,jdbcType=VARCHAR})"
     })
     @Options(statementType = StatementType.CALLABLE)
-    void batchUpdateCompanyWechatName(String companyWechatId, String companyWechatName);
+    void batchUpdateCompanyWechatName(String companyId, String companyName);
 
     IPage<SysDictCompanyVO> sysDictCompanyList(Page page,
                                                @Param("ex") ZfireParamBean zfireParam,
-                                               @Param("companyWechatIds") List<String> companyWechatIds);
+                                               @Param("companyIds") List<String> companyIds);
 
     IPage<AdminWebsitVO> listWebsit(Page page, @Param("ex") ZfireParamBean zfireParam);
 }

src/main/java/com/gree/mall/manager/commonmapper/CountMapper.java

@@ -21,7 +21,7 @@ public interface CountMapper {
      * @return
      */
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    public CountBean countInfo(@Param("companyWechatIds") List<String> companyWechatIds,
+    public CountBean countInfo(@Param("companyIds") List<String> companyIds,
                                @Param("adminWebsitIds") List<String> adminWebsitIds);
 
     /**
@@ -31,7 +31,7 @@ public interface CountMapper {
     public CountOrderBean countSaleOrder(@Param("startTime") String startTime,
                                          @Param("endTime") String endTime,
                                          @Param("workOrderType") String workOrderType,
-                                         @Param("companyWechatIds") List<String> companyWechatIds,
+                                         @Param("companyIds") List<String> companyIds,
                                          @Param("websitIds") List<String> websitIds);
 
     /**
@@ -41,7 +41,7 @@ public interface CountMapper {
     @SqlParser
     public List<GoodsRankBean> countGoodsRank(@Param("startTime") String startTime,
                                               @Param("endTime") String endTime,
-                                              @Param("companyWechatIds") List<String> companyWechatIds,
+                                              @Param("companyIds") List<String> companyIds,
                                               @Param("websitIds") List<String> websitIds);
 
     /**
@@ -50,7 +50,7 @@ public interface CountMapper {
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public Integer countVisit(@Param("startTime") String startTime,
                               @Param("endTime") String endTime,
-                              @Param("companyWechatIds") List<String> companyWechatIds,
+                              @Param("companyIds") List<String> companyIds,
                               @Param("adminWebsitIds") List<String> adminWebsitIds);
 
 
@@ -58,7 +58,7 @@ public interface CountMapper {
      * 师傅的销售金额统计(外部接口结算用)
      */
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    public List<Map<String,Object>> countWorkAmount(@Param("startTime") String startTime, @Param("endTime") String endTime,@Param("companyWechatIds") List<String> companyWechatIds);
+    public List<Map<String,Object>> countWorkAmount(@Param("startTime") String startTime, @Param("endTime") String endTime,@Param("companyIds") List<String> companyIds);
 
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public Map<String,Object> countWebsitAmount(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("websitNumbers") List<String> websitNumbers);
@@ -68,7 +68,7 @@ public interface CountMapper {
      *  优惠券统计列表
      */
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    public IPage<GiftExchangeCodeBean> queryExchangeCodeCountList(IPage page,@Param("keyword") String keyword,@Param("adminWebsitId") String adminWebsitId,@Param("companyWechatIds") List<String> companyWechatIds);
+    public IPage<GiftExchangeCodeBean> queryExchangeCodeCountList(IPage page,@Param("keyword") String keyword,@Param("adminWebsitId") String adminWebsitId,@Param("companyIds") List<String> companyIds);
 
 
 }

src/main/java/com/gree/mall/manager/commonmapper/CouponDateMapper.java

@@ -28,19 +28,19 @@ public interface CouponDateMapper {
     List<CouponUserBean> couponTagUser(@Param("couponId")String couponId);
 
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    List<CouponUserTypeBean> reissueCouponUser(@Param("companyWechatId")String companyWechatId, @Param("couponId")String couponId);
+    List<CouponUserTypeBean> reissueCouponUser(@Param("companyId")String companyId, @Param("couponId")String couponId);
 
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    IPage<CouponPageBean> pageCoupon(Page<CouponPageBean> objectPage, @Param("companyWechatIds")List<String> companyWechatIds,
+    IPage<CouponPageBean> pageCoupon(Page<CouponPageBean> objectPage, @Param("companyIds")List<String> companyIds,
                                      @Param("couponName")String couponName, @Param("couponType")String couponType, @Param("flag")String flag);
 
 
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    List<CouponExportBean> exportCoupon(@Param("companyWechatIds")List<String> companyWechatIds,
+    List<CouponExportBean> exportCoupon(@Param("companyIds")List<String> companyIds,
                                         @Param("couponName")String couponName, @Param("couponType")String couponType, @Param("flag")String flag);
 
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    List<CouponExportBean> exportSelfCoupon(@Param("companyWechatIds")List<String> companyWechatIds,
+    List<CouponExportBean> exportSelfCoupon(@Param("companyIds")List<String> companyIds,
                                             @Param("couponName")String couponName, @Param("couponType")String couponType, @Param("flag")String flag);
 
     IPage<CouponVO> couponList(Page page, @Param("ex") ZfireParamBean zfireParam);

src/main/java/com/gree/mall/manager/commonmapper/CustomGoodsCategoryMapper.java

@@ -9,6 +9,6 @@ public interface CustomGoodsCategoryMapper {
 
 
     List<GoodsCategoryBean> list(@Param("level") Integer level, @Param("status") Boolean status,
-                                 @Param("name") String name,@Param("companyWechatIds") List<String> companyWechatIds);
+                                 @Param("name") String name,@Param("companyIds") List<String> companyIds);
 
 }

src/main/java/com/gree/mall/manager/commonmapper/CustomMemberMapper.java

@@ -12,5 +12,5 @@ public interface CustomMemberMapper {
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<MemberBean> queryUser(@Param("type")String type, @Param("keyword")String keyword,
                                @Param("websitNos")List<String> websitNos, @Param("startTime")String startTime,
-                               @Param("endTime")String endTime, @Param("companyWechatIds")List<String> companyWechatIds);
+                               @Param("endTime")String endTime, @Param("companyIds")List<String> companyIds);
 }

src/main/java/com/gree/mall/manager/commonmapper/OrderMapper.java

@@ -1,7 +1,6 @@
 package com.gree.mall.manager.commonmapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.bean.order.OrderDetailBean;
 import com.gree.mall.manager.bean.order.OrderDetailListBean;
 import com.gree.mall.manager.plus.entity.OrderInfo;
 import org.apache.ibatis.annotations.Mapper;
@@ -20,7 +19,7 @@ public interface OrderMapper {
             @Param("startPayTime")String startPayTime,  @Param("endPayTime")String endPayTime,  @Param("promotionGroupUserName")String promotionGroupUserName,
             @Param("promotionGroupId")String promotionGroupId,@Param("promotionGroupUserId") String promotionGroupUserId,@Param("websitId") String websitId,
             @Param("goodsId") String goodsId,
-            @Param("companyWechatIds") List<String> companyWechatIds,@Param("websitIds") List<String> websitIds
+            @Param("companyIds") List<String> companyIds,@Param("websitIds") List<String> websitIds
     );
 
     //查询派工异常订单
@@ -30,5 +29,5 @@ public interface OrderMapper {
                                            @Param("endCreateTime")String endCreateTime, @Param("startPayTime")String startPayTime,
                                            @Param("endPayTime")String endPayTime, @Param("websitId")String websitId,
                                            @Param("isNegative")String isNegative, @Param("abnormalDispatch")String abnormalDispatch,
-                                           @Param("companyWechatIds") List<String> companyWechatIds,@Param("websitIds") List<String> websitIds);
+                                           @Param("companyIds") List<String> companyIds,@Param("websitIds") List<String> websitIds);
 }

src/main/java/com/gree/mall/manager/commonmapper/SecKillMapper.java

@@ -19,7 +19,7 @@ public interface SecKillMapper {
     IPage<CustomSecSpecBean> querySecSpec(IPage page,
                                           @Param("keyword")String keyword,
                                           @Param("status") Integer status,
-                                          @Param("companyWechatIds") List<String> companyWechatIds);
+                                          @Param("companyIds") List<String> companyIds);
 
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<SecKillActivitySpecBean> querySecDetail(@Param("secKillId")String secKillId);
@@ -30,7 +30,7 @@ public interface SecKillMapper {
             @Param("status")Integer status,
             @Param("keyword")String keyword,
             @Param("startTime")Date startTime,
-            @Param("companyWechatIds") List<String> companyWechatIds);
+            @Param("companyIds") List<String> companyIds);
 
 
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
@@ -38,10 +38,10 @@ public interface SecKillMapper {
             IPage page,
             @Param("categoryId")String categoryId,
             @Param("keyword")String keyword,
-            List<String> companyWechatIds);
+            List<String> companyIds);
 
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    IPage<CustomSecSpecBean> querySpecListforCoupon(Page<CustomSecSpecBean> objectPage,@Param("companyWechatIds") List<String> companyWechatIds,
+    IPage<CustomSecSpecBean> querySpecListforCoupon(Page<CustomSecSpecBean> objectPage,@Param("companyIds") List<String> companyIds,
                                                     @Param("categoryId")String categoryId, @Param("keyword")String keyword);
 
 }

src/main/java/com/gree/mall/manager/commonmapper/SopRulePushMapper.java

@@ -20,7 +20,7 @@ public interface SopRulePushMapper {
     IPage<SopRuleData> list(IPage page,
                             @Param("ruleName") String ruleName,
                             @Param("status") Integer status,
-                            @Param("companyWechatIds") List<String> companyWechatIds,
+                            @Param("companyIds") List<String> companyIds,
                             @Param("id") String id);
 
     SopPushTaskData detailTask(String id);

src/main/java/com/gree/mall/manager/commonmapper/TaxMapper.java

@@ -16,7 +16,7 @@ public interface TaxMapper {
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     List<GoodsCategory> queryGoodsCategoryByOrderId(@Param("orderId")String orderId);
 
-    List<OrderTaxExcelBean> queryOrderTaxExcelMsg(@Param("companyWechatIds")List<String> companyWechatIds, @Param("adminWebsitIds")List<String> adminWebsitIds
+    List<OrderTaxExcelBean> queryOrderTaxExcelMsg(@Param("companyIds")List<String> companyIds, @Param("adminWebsitIds")List<String> adminWebsitIds
             ,@Param("status") Boolean status, @Param("orderId")String orderId);
 
 }

src/main/java/com/gree/mall/manager/config/aop/OperationLogAspect.java

@@ -9,9 +9,7 @@ import com.gree.mall.manager.plus.service.AdminUserService;
 import com.gree.mall.manager.plus.service.OperationLogService;
 import com.gree.mall.manager.utils.CommonUtils;
 import com.gree.mall.manager.utils.IpUtil;
-import com.gree.mall.manager.utils.JwtUtils;
 import com.gree.mall.manager.utils.RedisUtil;
-import io.jsonwebtoken.Claims;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -109,8 +107,8 @@ public class OperationLogAspect {
             operationLog.setNickName(nickName);
             operationLog.setIp(IpUtil.getIpAddr(request));
             operationLog.setCreateTime(new Date());
-            operationLog.setCompanyWechatId(adminUser.getLoginCompanyWechatId());
-            operationLog.setCompanyName(adminUser.getLoginCompanyName());
+            operationLog.setCompanyId(null);
+            operationLog.setCompanyName(null);
             operationLogService.save(operationLog);
         }
     }

src/main/java/com/gree/mall/manager/constant/Constant.java

@@ -4,8 +4,6 @@ public class Constant {
 
     //校验的token
     public static final String TOKEN_NAME = "x-token";
-    //广州格力售后服务(对接工单系统的企业微信)
-    public static final String GD_COMPANY_WECHAT_ID = "1";
 
     //会话存档大小
     public static final String HHCD_FILE_SIZE = "5000000";

src/main/java/com/gree/mall/manager/controller/activity/SecKillController.java

@@ -1,142 +0,0 @@
-package com.gree.mall.manager.controller.activity;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.bean.activity.CustomSecSpecBean;
-import com.gree.mall.manager.bean.activity.SecKillActivityBean;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.activity.SecKillLogic;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
-
-@Slf4j
-@RestController
-@Api(value = "秒杀商品列表", tags ={"秒杀商品列表"} )
-@RequestMapping(value = "/sec-kill/goods/", produces = "application/json; charset=utf-8")
-public class SecKillController {
-
-    @Resource
-    SecKillLogic secKillLogic;
-
-    @GetMapping("/list/spec/page")
-    @ApiOperation(value = "秒杀商品列表")
-    public ResponseHelper<IPage<CustomSecSpecBean>> page(
-            @ApiParam(value = "秒杀状态,0全部,1未开始,2进行中,3已结束,4已关闭") @RequestParam(required = false) Integer status,
-            @ApiParam(value = "商品名称") @RequestParam(required = false) String keyword,
-            @ApiParam(value = "页号",required = true) @RequestParam Integer pageNum,
-            @ApiParam(value = "页大小",required = true) @RequestParam Integer pageSize,
-            HttpServletRequest request
-    ) throws Exception {
-        return ResponseHelper.success(secKillLogic.pageSpec(status,keyword, pageNum, pageSize,request));
-    }
-
-    @GetMapping("/list/activity/page")
-    @ApiOperation(value = "秒杀活动列表")
-    public ResponseHelper pageActivity(
-            @ApiParam(value = "秒杀状态,0全部,1未开始,2进行中,3已结束") @RequestParam(required = false) Integer status,
-            @ApiParam(value = "商品名称") @RequestParam(required = false) String keyword,
-            @ApiParam(value = "开始时间") @RequestParam(required = false) Date startTime,
-            @ApiParam(value = "页号",required = true) @RequestParam Integer pageNum,
-            @ApiParam(value = "页大小",required = true) @RequestParam Integer pageSize,
-            HttpServletRequest request
-    ) throws Exception {
-        return ResponseHelper.success(secKillLogic.pageActivity(status,keyword,startTime,pageNum, pageSize,request));
-    }
-
-
-    @GetMapping("/list/spec/select")
-    @ApiOperation(value = "秒杀选择活动商品列表")
-    public ResponseHelper pageActivityGoods(
-            @ApiParam(value = "商品名称") @RequestParam(required = false) String keyword,
-            @ApiParam(value = "商品分类id") @RequestParam(required = false) String categoryId,
-            @ApiParam(value = "页号",required = true) @RequestParam Integer pageNum,
-            @ApiParam(value = "页大小",required = true) @RequestParam Integer pageSize,
-            HttpServletRequest request
-    ) throws Exception {
-        return ResponseHelper.success(secKillLogic.goodsSpecList(categoryId,keyword,pageNum, pageSize,request));
-    }
-
-
-    @PostMapping("/activity/add")
-    @ApiOperation(value = "新增秒杀活动")
-    public ResponseHelper add(
-            @ApiParam(value = "object",required = true) @RequestBody SecKillActivityBean secKillActivityBean,
-            HttpServletRequest request
-    ) throws RemoteServiceException {
-        secKillLogic.add(secKillActivityBean,request);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/activity/update")
-    @ApiOperation(value = "编辑秒杀活动")
-    public ResponseHelper update(
-            HttpServletRequest request,
-            @ApiParam(value = "object",required = true) @RequestBody SecKillActivityBean secKillActivityBean)
-            throws RemoteServiceException {
-        secKillLogic.update(request, secKillActivityBean);
-        return ResponseHelper.success();
-    }
-
-    @GetMapping("/activity/detail")
-    @ApiOperation(value = "秒杀活动详情")
-    public ResponseHelper activityDetail(
-            @ApiParam(value = "秒杀活动secKillId",required = true) @RequestParam String secKillId
-    ) {
-        return ResponseHelper.success(secKillLogic.detail(secKillId));
-    }
-    @PostMapping("/activity/close")
-    @ApiOperation(value = "关闭秒杀活动")
-    public ResponseHelper activityClose(
-            @ApiParam(value = "秒杀活动secKillId",required = true) @RequestParam String secKillId
-    ) {
-        secKillLogic.updateStatus(secKillId,false);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/activity/open")
-    @ApiOperation(value = "重新开启秒杀活动")
-    public ResponseHelper activityOpen(
-            @ApiParam(value = "秒杀活动secKillId",required = true) @RequestParam String secKillId
-    ) {
-        secKillLogic.updateStatus(secKillId,true);
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("/spec/delete")
-    @ApiOperation(value = "删除秒杀商品")
-    public ResponseHelper specDelete(
-            @ApiParam(value = "secKillSpecId",required = true) @RequestParam String secKillSpecId
-    ) throws RemoteServiceException {
-        secKillLogic.specDelete(secKillSpecId);
-        return ResponseHelper.success();
-    }
-    @PostMapping("/spec/close")
-    @ApiOperation(value = "关闭秒杀商品")
-    public ResponseHelper close(
-            @ApiParam(value = "secKillSpecId",required = true) @RequestParam String secKillSpecId
-    ) throws RemoteServiceException {
-        secKillLogic.specClose(secKillSpecId);
-        return ResponseHelper.success();
-    }
-
-
-
-
-//    @PostMapping("/updateStockNum")
-//    @ApiOperation(value = "秒杀活动开始后增加或减少库存")
-//    public ResponseHelper updateStockNum(
-//            @ApiParam(value = "secKillSpecId",required = true) @RequestParam String secKillSpecId,
-//            @ApiParam(value = "stockNum,增加为正数,减少为负",required = true) @RequestParam Integer stockNum
-//    ) throws RemoteServiceException {
-//        secKillLogic.updateStockNum(secKillSpecId,stockNum);
-//        return ResponseHelper.success();
-//    }
-}

src/main/java/com/gree/mall/manager/controller/admin/AdminDeptController.java

@@ -44,14 +44,6 @@ public class AdminDeptController {
         return ResponseHelper.success(tree);
     }
 
-    @GetMapping("/treeWebsit")
-    @ApiOperation("部门树合并网点")
-    public ResponseHelper<AdminDeptTree> treeWebsit(HttpServletRequest request) {
-        List<AdminDeptTree> tree = adminDeptLogic.treeWebsit(request);
-        return ResponseHelper.success(tree);
-    }
-
-
     @ZfireList
     @PostMapping("/list")
     @ApiOperation(value = "部门列表")

src/main/java/com/gree/mall/manager/controller/common/CommonController.java

@@ -5,9 +5,11 @@ import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.helper.ResponseHelper;
 import com.gree.mall.manager.logic.ExpressLogic;
 import com.gree.mall.manager.logic.common.CommonLogic;
-import com.gree.mall.manager.logic.common.GongdanLogic;
 import com.gree.mall.manager.logic.common.kuaidi100.response.SubscribeResp;
-import com.gree.mall.manager.plus.entity.*;
+import com.gree.mall.manager.plus.entity.CommonFile;
+import com.gree.mall.manager.plus.entity.ExpressCompany;
+import com.gree.mall.manager.plus.entity.ExpressInfo;
+import com.gree.mall.manager.plus.entity.Region;
 import com.gree.mall.manager.plus.service.OrderDetailService;
 import com.gree.mall.manager.plus.service.OrderInfoService;
 import com.gree.mall.manager.utils.CommonUtils;
@@ -38,8 +40,6 @@ public class CommonController {
     @Autowired
     ExpressLogic expressLogic;
     @Autowired
-    GongdanLogic gongdanLogic;
-    @Autowired
     OrderInfoService orderInfoService;
     @Autowired
     OrderDetailService orderDetailService;
@@ -101,31 +101,6 @@ public class CommonController {
         return ResponseHelper.success(list);
     }
 
-
-    @GetMapping("/gongdan/smalltype")
-    @ApiOperation(value = "工单小类")
-    public ResponseHelper<List> regionList(
-            @ApiParam(value = "大类",required = true) @RequestParam(required = true) String mainNumber,
-            @ApiParam(value = "分类id",required = true) @RequestParam(required = true) String categoryId
-    ) throws Exception {
-
-        List smallType = gongdanLogic.getSmallType(mainNumber,categoryId);
-        return ResponseHelper.success(smallType);
-    }
-
-
-    @GetMapping("/testOrder")
-    @ApiOperation(value = "测试生成安装工单")
-    public ResponseHelper testOrder(
-            @ApiParam(required = true, value = "订单号") @RequestParam(required = true) String orderId,
-            @ApiParam(required = true, value = "大类编号") @RequestParam(required = true) String mainNumber
-    ) throws Exception {
-        OrderInfo orderInfo = orderInfoService.getById(orderId);
-        List<OrderDetail> list = orderDetailService.lambdaQuery().eq(OrderDetail::getOrderId, orderId).list();
-        String s = gongdanLogic.installOrder(orderInfo, list, mainNumber);
-        return ResponseHelper.success(s);
-    }
-
     @ApiNotAuth
     @ApiOperation("获取获取前往小程序链接")
     @GetMapping("/getUrlScheme")

src/main/java/com/gree/mall/manager/controller/goods/GoodsController.java

@@ -3,16 +3,12 @@ package com.gree.mall.manager.controller.goods;
 import cn.hutool.core.lang.TypeReference;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.dtflys.forest.annotation.Request;
 import com.gree.mall.manager.annotation.ApiNotAuth;
 import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.admin.AdminWebsitVO;
 import com.gree.mall.manager.bean.goods.*;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.common.GongdanLogic;
 import com.gree.mall.manager.logic.goods.GoodsLogic;
-import com.gree.mall.manager.plus.entity.Goods;
 import com.gree.mall.manager.plus.entity.User;
 import com.gree.mall.manager.utils.excel.ExcelUtils;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
@@ -22,18 +18,15 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.xml.ws.Response;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 @Slf4j
 @RestController
@@ -42,8 +35,6 @@ import java.util.Map;
 public class GoodsController {
     @Resource
     GoodsLogic goodsLogic;
-    @Autowired
-    GongdanLogic gongdanLogic;
 
 
     @GetMapping("/count")
@@ -289,15 +280,6 @@ public class GoodsController {
         return ResponseHelper.success();
     }
 
-    @GetMapping("/marketing/list")
-    @ApiOperation(value = "营销活动列表")
-    public ResponseHelper<List<Map<String,Object>>> marketingList(
-            @ApiParam(value = "类型 1=安装 2=维修") @RequestParam(required = true) Integer type
-    ) throws Exception {
-        List<Map<String, Object>> marketingList = gongdanLogic.getMarketingList(type);
-        return ResponseHelper.success(marketingList);
-    }
-
     //@ApiOperation(" 用 商品规格的 分销金额 覆盖其 为null的 内部分销金额")
     //@PostMapping("/syncGoodsSpecInnerShareMsg")
     public ResponseHelper<Void> syncGoodsSpecInnerShareMsg(HttpServletRequest request){

src/main/java/com/gree/mall/manager/controller/order/OrderController.java

@@ -6,11 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.gree.mall.manager.bean.order.BatchRemarkBean;
 import com.gree.mall.manager.bean.order.OrderDetailBean;
-import com.gree.mall.manager.bean.order.WorkerOrderInfo;
 import com.gree.mall.manager.constant.Constant;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.common.GongdanLogic;
 import com.gree.mall.manager.logic.order.OrderLogic;
 import com.gree.mall.manager.plus.entity.OrderInfo;
 import com.gree.mall.manager.plus.entity.OrderRefundCliaims;
@@ -28,7 +26,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
@@ -43,8 +40,6 @@ public class OrderController {
     @Autowired
     OrderLogic orderLogic;
     @Autowired
-    GongdanLogic gongdanLogic;
-    @Autowired
     RedisLockRegistry redisLockRegistry;
 
     @GetMapping("/list")
@@ -252,31 +247,6 @@ public class OrderController {
         return ResponseHelper.success();
     }
 
-    @GetMapping("/work/list")
-    @ApiOperation("工单列表")
-    public ResponseHelper<List<WorkerOrderInfo>> workList(
-            @ApiParam(value = "订单号", required = false) @RequestParam(required = false) String orderId
-    ) throws Exception {
-        OrderDetailBean detail = orderLogic.detail(orderId);
-        long install = detail.getOrderDetails().stream().map(v -> v.getWorkOrderType().equals("INSTALL")).count();
-        long repair = detail.getOrderDetails().stream().map(v -> v.getWorkOrderType().equals("REPAIR")).count();
-        List<WorkerOrderInfo> workerOrderList = new ArrayList<>();
-        if(install > 0) {
-            workerOrderList.addAll(gongdanLogic.getInstallOrderList(orderId));
-        }
-        if(repair > 0) {
-            workerOrderList.addAll(gongdanLogic.getRepairOrderList(orderId));
-        }
-        for(WorkerOrderInfo workerOrderInfo:workerOrderList){
-            workerOrderInfo.setOrderId(orderId);
-            workerOrderInfo.setPayTime(detail.getPayTime());
-            workerOrderInfo.setOrderDetails(detail.getOrderDetails());
-        }
-        return ResponseHelper.success(workerOrderList);
-    }
-
-
-
 
     @GetMapping("/export")
     @ApiOperation("导出excel")

src/main/java/com/gree/mall/manager/controller/report/OfflineDataController.java

@@ -1,120 +0,0 @@
-package com.gree.mall.manager.controller.report;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gree.mall.manager.bean.ExcelData;
-import com.gree.mall.manager.bean.Freight.FreightTemplateBean;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.report.OfflineDataLogic;
-import com.gree.mall.manager.plus.entity.FreightTemplate;
-import com.gree.mall.manager.plus.entity.OfflineSaleRecord;
-import com.gree.mall.manager.utils.excel.ExcelUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-@Slf4j
-@RestController
-@Api(value = "线下销售", tags = {"线下销售"})
-@RequestMapping(value = "/offline", produces = "application/json; charset=utf-8")
-public class OfflineDataController {
-    @Autowired
-    private OfflineDataLogic offlineDataLogic;
-
-    @GetMapping("/list")
-    @ApiOperation(value = "列表")
-    public ResponseHelper<Page<OfflineSaleRecord>> page(HttpServletRequest request,
-            @ApiParam(value = "销售员姓名", required = false) @RequestParam(required = false) String name,
-            @ApiParam(value = "销售员手机号", required = false) @RequestParam(required = false) String phone,
-            @ApiParam(value = "网点名称", required = false) @RequestParam(required = false) String websitName,
-            @ApiParam(value = "网点编号", required = false) @RequestParam(required = false) String websitNumber,
-            @ApiParam(value = "商品类别", required = false) @RequestParam(required = false) String category,
-            @ApiParam(value = "商品数量", required = false) @RequestParam(required = false) Integer num,
-            @ApiParam(value = "销售额下限", required = false) @RequestParam(required = false) BigDecimal minAmount,
-            @ApiParam(value = "销售额上限", required = false) @RequestParam(required = false) BigDecimal maxAmount,
-            @ApiParam(value = "状态(true：正常 false:作废", required = false) @RequestParam(required = false) Boolean status,
-            @ApiParam(value = "销售开始时间", required = false) @RequestParam(required = false) String startTime,
-            @ApiParam(value = "销售结束时间", required = false) @RequestParam(required = false) String endTime,
-            @ApiParam(value = "页号", required = true) @RequestParam(required = true) Integer pageNum,
-            @ApiParam(value = "页大小", required = true) @RequestParam(required = true) Integer pageSize
-    ) {
-        IPage page = offlineDataLogic.page(request,name, phone, websitName, websitNumber,
-                category, num, minAmount, maxAmount, status,
-                startTime, endTime, pageNum, pageSize);
-        return ResponseHelper.success(page);
-    }
-
-    @GetMapping("/export")
-    @ApiOperation(value = "导出")
-    public void importData(
-            HttpServletRequest request,
-            @ApiParam(value = "销售员姓名", required = false) @RequestParam(required = false) String name,
-            @ApiParam(value = "销售员手机号", required = false) @RequestParam(required = false) String phone,
-            @ApiParam(value = "网点名称", required = false) @RequestParam(required = false) String websitName,
-            @ApiParam(value = "网点编号", required = false) @RequestParam(required = false) String websitNumber,
-            @ApiParam(value = "商品类别", required = false) @RequestParam(required = false) String category,
-            @ApiParam(value = "商品数量", required = false) @RequestParam(required = false) Integer num,
-            @ApiParam(value = "销售额下限", required = false) @RequestParam(required = false) BigDecimal minAmount,
-            @ApiParam(value = "销售额上限", required = false) @RequestParam(required = false) BigDecimal maxAmount,
-            @ApiParam(value = "状态(true：正常 false:作废", required = false) @RequestParam(required = false) Boolean status,
-            @ApiParam(value = "销售开始时间", required = false) @RequestParam(required = false) String startTime,
-            @ApiParam(value = "销售结束时间", required = false) @RequestParam(required = false) String endTime,
-            HttpServletResponse response
-    ) throws Exception {
-        List<OfflineSaleRecord> records = offlineDataLogic.page(request, name, phone, websitName, websitNumber,
-                category, num, minAmount, maxAmount, status,
-                startTime, endTime, 1, -1).getRecords();
-        ExcelData excelData = offlineDataLogic.exportData(records);
-        SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy_MM_dd_HH_mm_ss");
-        ExcelUtils.exportExcel(request, response, "线下数据"+simpleDateFormat.format(new Date())+".xlsx", excelData);
-
-    }
-
-
-
-    @PostMapping("/delete")
-    @ApiOperation(value = "删除销售数据")
-    public ResponseHelper delete(
-            @ApiParam(value = "id", required = true) @RequestParam(required = true) String id
-    ) {
-        offlineDataLogic.delete(id);
-        return ResponseHelper.success();
-    }
-
-    @GetMapping("/detail")
-    @ApiOperation(value = "销售数据详情")
-    public ResponseHelper detail(
-            @ApiParam(value = "id", required = true) @RequestParam(required = true) String id
-    ) {
-        return ResponseHelper.success(offlineDataLogic.detail(id));
-    }
-
-    @PostMapping("/save")
-    @ApiOperation(value = "新增销售数据")
-    public ResponseHelper save(HttpServletRequest request,
-            @ApiParam(value = "销售数据", required = true) @RequestBody(required = true) OfflineSaleRecord offlineSaleRecord
-    ) {
-        String id = offlineDataLogic.save(request,offlineSaleRecord);
-        return ResponseHelper.success(id);
-    }
-
-    @PostMapping("/update")
-    @ApiOperation(value = "修改销售数据")
-    public ResponseHelper update(
-            @ApiParam(value = "销售数据", required = true) @RequestBody(required = true) OfflineSaleRecord offlineSaleRecord
-    ) {
-        offlineDataLogic.update(offlineSaleRecord);
-        return ResponseHelper.success();
-    }
-
-}

src/main/java/com/gree/mall/manager/controller/report/SalesReportController.java

@@ -1,22 +1,16 @@
 package com.gree.mall.manager.controller.report;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.report.OfflineDataLogic;
 import com.gree.mall.manager.logic.report.SalesReportLogic;
-import com.gree.mall.manager.plus.entity.OfflineSaleRecord;
 import com.gree.mall.manager.utils.DateUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 

src/main/java/com/gree/mall/manager/logic/CarouselMapLogic.java

@@ -1,7 +1,6 @@
 package com.gree.mall.manager.logic;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.logic.common.CommonLogic;
@@ -16,7 +15,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
 import java.util.List;
 
 @Service
@@ -112,11 +110,9 @@ public class CarouselMapLogic {
         if (StringUtils.isNotBlank(goodsId)) {
             return goodsService.lambdaQuery()
                     .eq(Goods::getGoodsId, goodsId)
-                    .in(CollectionUtils.isNotEmpty(companyWechatIds), Goods::getCompanyWechatId, companyWechatIds)
                     .page(new Page<>(pageNum, pageSize));
         }
         return goodsService.lambdaQuery()
-                .in(CollectionUtils.isNotEmpty(companyWechatIds), Goods::getCompanyWechatId, companyWechatIds)
                 .eq(Goods::getStatus, true)
                 .like(StringUtils.isNotBlank(goodsName), Goods::getGoodsName, goodsName)
                 .page(new Page<>(pageNum, pageSize));

src/main/java/com/gree/mall/manager/logic/FreightLogic.java

@@ -104,8 +104,8 @@ public class FreightLogic {
         List<FreightTemplateDetail> freightTemplateDetails = freightTemplateBean.getFreightTemplateDetails();
         for (FreightTemplateDetail freightTemplateDetail : freightTemplateDetails) {
             freightTemplateDetail.setFreightTemplateId(freightTemplateBean.getFreightTemplateId());
-            freightTemplateDetail.setCompanyWechatId(adminUser.getLoginCompanyWechatId());
-            freightTemplateDetail.setCompanyName(adminUser.getLoginCompanyName());
+            freightTemplateDetail.setCompanyId(null);
+            freightTemplateDetail.setCompanyName(null);
             freightTemplateDetail.setCreateTime(new Date());
         }
         freightTemplateDetailService.saveBatch(freightTemplateDetails);
@@ -133,10 +133,10 @@ public class FreightLogic {
     public BigDecimal getFreightAmount(HttpServletRequest request, String province, String city, String area, Integer num) throws RemoteServiceException {
 
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
+        List<String> companyIds = adminUser.getAdminCompanyIds();
 
         FreightTemplateDetail one = freightTemplateDetailService.lambdaQuery()
-                .in(CollectionUtils.isNotEmpty(companyWechatIds), FreightTemplateDetail::getCompanyWechatId, companyWechatIds)
+                .in(CollectionUtils.isNotEmpty(companyIds), FreightTemplateDetail::getCompanyId, companyIds)
                 .eq(FreightTemplateDetail::getProvince, province)
                 .eq(FreightTemplateDetail::getCity, city)
 //                .eq(FreightTemplateDetail::getArea, area)

src/main/java/com/gree/mall/manager/logic/StorageLogic.java

@@ -1,14 +1,11 @@
 package com.gree.mall.manager.logic;
 
-import com.aliyuncs.utils.StringUtils;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
-import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.plus.entity.Storage;
 import com.gree.mall.manager.plus.service.StorageService;
-import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -52,7 +49,7 @@ public class StorageLogic {
     public Storage detailByName(String companyWechatId,String name) {
         return storageService
                 .lambdaQuery()
-                .eq(Storage::getCompanyWechatId, companyWechatId)
+                .eq(Storage::getCompanyId, companyWechatId)
                 .eq(Storage::getStorageName,name)
                 .one();
     }

src/main/java/com/gree/mall/manager/logic/activity/PromotionApplyLogic.java

@@ -91,7 +91,7 @@ public class PromotionApplyLogic {
 
         PromotionApply promotionApply = new PromotionApply();
         promotionApply.setId(id);
-        promotionApply.setCompanyWechatId(user.getCompanyWechatId());
+        promotionApply.setCompanyId(user.getCompanyId());
         promotionApply.setCompanyName(user.getCompanyName());
         promotionApply.setUserId(user.getUserId());
         promotionApply.setWorkerName(user.getWorkName());

src/main/java/com/gree/mall/manager/logic/activity/PromotionDiscountLogic.java

@@ -1,18 +1,15 @@
 package com.gree.mall.manager.logic.activity;
 
-import com.aliyuncs.utils.StringUtils;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
-import com.gree.mall.manager.plus.entity.PromotionApply;
 import com.gree.mall.manager.plus.entity.PromotionDiscount;
 import com.gree.mall.manager.plus.service.PromotionDiscountService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.rmi.Remote;
 import java.util.Date;
 
 @Service
@@ -33,7 +30,7 @@ public class PromotionDiscountLogic {
     public IPage<PromotionDiscount> list(Integer pageNum,Integer pageSize){
         AdminUserCom adminUser = commonLogic.getAdminUser();
         IPage<PromotionDiscount> page = promotionDiscountService.lambdaQuery()
-                .eq(PromotionDiscount::getCompanyWechatId, adminUser.getCompanyWechatId())
+                .eq(PromotionDiscount::getCompanyId, adminUser.getCompanyId())
                 .orderByDesc(PromotionDiscount::getCreateTime).page(new Page<>(pageNum, pageSize));
         return page;
     }
@@ -44,7 +41,7 @@ public class PromotionDiscountLogic {
     public void add(PromotionDiscount promotionDiscount){
         AdminUserCom adminUser = commonLogic.getAdminUser();
         Integer count = promotionDiscountService.lambdaQuery()
-                .eq(PromotionDiscount::getCompanyWechatId, adminUser.getCompanyWechatId())
+                .eq(PromotionDiscount::getCompanyId, adminUser.getCompanyId())
                 .eq(PromotionDiscount::getLimitUpperAmount,promotionDiscount.getLimitUpperAmount())
                 .count();
         if(count > 0){
@@ -54,7 +51,7 @@ public class PromotionDiscountLogic {
             throw new RemoteServiceException("请填写大于0小于1的值");
         }
 
-        promotionDiscount.setCompanyWechatId(adminUser.getCompanyWechatId());
+        promotionDiscount.setCompanyId(adminUser.getCompanyId());
         promotionDiscount.setCompanyName(adminUser.getCompanyName());
         promotionDiscount.setCreateTime(new Date());
         promotionDiscount.insert();
@@ -66,7 +63,7 @@ public class PromotionDiscountLogic {
     public void update(PromotionDiscount promotionDiscount){
         AdminUserCom adminUser = commonLogic.getAdminUser();
         Integer count = promotionDiscountService.lambdaQuery()
-                .eq(PromotionDiscount::getCompanyWechatId, adminUser.getCompanyWechatId())
+                .eq(PromotionDiscount::getCompanyId, adminUser.getCompanyId())
                 .eq(PromotionDiscount::getLimitUpperAmount,promotionDiscount.getLimitUpperAmount())
                 .ne(PromotionDiscount::getId,promotionDiscount.getId())
                 .count();

src/main/java/com/gree/mall/manager/logic/activity/PromotionGroupLogic.java

@@ -64,11 +64,11 @@ public class PromotionGroupLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
         //已结束
         int count = promotionGroupService.lambdaQuery()
-                .in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()),PromotionGroup::getCompanyWechatId,adminUser.getAdminCompanyIds())
+                .in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()),PromotionGroup::getCompanyId,adminUser.getAdminCompanyIds())
                 .eq(PromotionGroup::getStatus,false).count();
         //进行中
         int count2 = promotionGroupService.lambdaQuery()
-                .in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()),PromotionGroup::getCompanyWechatId,adminUser.getAdminCompanyIds())
+                .in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()),PromotionGroup::getCompanyId,adminUser.getAdminCompanyIds())
                 .eq(PromotionGroup::getStatus,true).count();
         Map<String,Integer> map = new HashMap<>();
         map.put("all",count+count2);
@@ -88,7 +88,7 @@ public class PromotionGroupLogic {
 
         IPage page = promotionGroupService.lambdaQuery()
                 .eq(status != null, PromotionGroup::getStatus, status)
-                .in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()),PromotionGroup::getCompanyWechatId,adminUser.getAdminCompanyIds())
+                .in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()),PromotionGroup::getCompanyId,adminUser.getAdminCompanyIds())
                 .orderByDesc(PromotionGroup::getCreateTime)
                 .page(new Page<>(pageNo, pageSize));
         //组装数据
@@ -172,8 +172,8 @@ public class PromotionGroupLogic {
         List<PromotionGroupUser> promotionGroupUsers = promotionGroupBean.getPromotionGroupUsers();
         List<String> userIds = promotionGroupUsers.stream().map(PromotionGroupUser::getUserId).collect(Collectors.toList());
         //1.保存团购活动
-        promotionGroupBean.setCompanyWechatId(adminUser.getLoginCompanyWechatId());
-        promotionGroupBean.setCompanyName(adminUser.getLoginCompanyName());
+        promotionGroupBean.setCompanyId(null);
+        promotionGroupBean.setCompanyName(null);
         promotionGroupBean.setCreateTime(new Date());
         promotionGroupService.save(promotionGroupBean);
         String promotionGroupId = promotionGroupBean.getPromotionGroupId();
@@ -189,7 +189,7 @@ public class PromotionGroupLogic {
             for (PromotionGroupSpec promotionGroupSpec : pGoods.getSpecs()) {
                 promotionGroupSpec.setStartTime(promotionGroupBean.getStartTime());
                 promotionGroupSpec.setEndTime(promotionGroupBean.getEndTime());
-                promotionGroupSpec.setCompanyWechatId(promotionGroupBean.getCompanyWechatId());
+                promotionGroupSpec.setCompanyId(promotionGroupBean.getCompanyId());
                 promotionGroupSpec.setCompanyName(promotionGroupBean.getCompanyName());
                 promotionGroupSpec.setSortNum(pGoods.getSortNum());
                 promotionGroupSpec.setCreateTime(new Date());
@@ -346,8 +346,8 @@ public class PromotionGroupLogic {
                 promotionGroupSpec.setGoodsName(good.getGoodsName());
                 promotionGroupSpec.setGoodsImgSrc(good.getGoodsImgSrc());
                 promotionGroupSpec.setPromotionGroupId(promotionGroupId);
-                promotionGroupSpec.setCompanyWechatId(adminUser.getLoginCompanyWechatId());
-                promotionGroupSpec.setCompanyName(adminUser.getLoginCompanyName());
+                promotionGroupSpec.setCompanyId(null);
+                promotionGroupSpec.setCompanyName(null);
                 promotionGroupSpecs.add(promotionGroupSpec);
 
                 promotionGroupSpecIds.add(promotionGroupSpec.getPromotionGroupSpecId());
@@ -376,8 +376,8 @@ public class PromotionGroupLogic {
                 promotionGroupUser.setMobile(user.getMobile());
                 promotionGroupUser.setAvatar(user.getAvatar());
                 promotionGroupUser.setCreateTime(new Date());
-                promotionGroupUser.setCompanyWechatId(adminUser.getLoginCompanyWechatId());
-                promotionGroupUser.setCompanyName(adminUser.getLoginCompanyName());
+                promotionGroupUser.setCompanyId(null);
+                promotionGroupUser.setCompanyName(null);
                 promotionGroupUsers.add(promotionGroupUser);
             }
             promotionGroupUserService.saveBatch(promotionGroupUsers);
@@ -393,8 +393,8 @@ public class PromotionGroupLogic {
                     promotionGroupSpecUser.setCreateTime(new Date());
                     promotionGroupSpecUser.setGroupPrice(promotionGroupSpec.getComGroupPrice());
                     promotionGroupSpecUser.setShareAmount(promotionGroupSpec.getComShareAmount());
-                    promotionGroupSpecUser.setCompanyWechatId(adminUser.getLoginCompanyWechatId());
-                    promotionGroupSpecUser.setCompanyName(adminUser.getLoginCompanyName());
+                    promotionGroupSpecUser.setCompanyId(null);
+                    promotionGroupSpecUser.setCompanyName(null);
                     specUsers.add(promotionGroupSpecUser);
 
                 }
@@ -427,7 +427,7 @@ public class PromotionGroupLogic {
                 promotionGroupSpecUser.setCreateTime(new Date());
                 promotionGroupSpecUser.setGroupPrice(promotionGroupSpec.getComGroupPrice());
                 promotionGroupSpecUser.setShareAmount(promotionGroupSpec.getComShareAmount());
-                promotionGroupSpecUser.setCompanyWechatId(user.getCompanyWechatId());
+                promotionGroupSpecUser.setCompanyId(user.getCompanyId());
                 promotionGroupSpecUser.setCompanyName(user.getCompanyName());
                 specUsers.add(promotionGroupSpecUser);
         }
@@ -437,7 +437,7 @@ public class PromotionGroupLogic {
     public void deleteGroupUser(User user){
         promotionGroupSpecUserService.lambdaUpdate()
                 .eq(PromotionGroupSpecUser::getUserId,user.getUserId())
-                .eq(StringUtils.isNotEmpty(user.getCompanyWechatId()),PromotionGroupSpecUser::getCompanyWechatId,user.getCompanyWechatId())
+                .eq(StringUtils.isNotEmpty(user.getCompanyId()),PromotionGroupSpecUser::getCompanyId,user.getCompanyId())
                 .remove();
         promotionGroupUserService.lambdaUpdate().eq(PromotionGroupUser::getUserId,user.getUserId()).remove();
     }
@@ -516,7 +516,7 @@ public class PromotionGroupLogic {
         List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         IPage<GoodsVisit> page = goodsVisitService.lambdaQuery()
-                .in(CollectionUtils.isNotEmpty(companyWechatIds), GoodsVisit::getCompanyWechatId, companyWechatIds)
+                .in(CollectionUtils.isNotEmpty(companyWechatIds), GoodsVisit::getCompanyId, companyWechatIds)
                 .eq(GoodsVisit::getPromotionGroupId,promotionGroupId)
                 .eq(GoodsVisit::getShareUserId, userId)
                 .orderByDesc(GoodsVisit::getCreateTime)

src/main/java/com/gree/mall/manager/logic/activity/PromotionLuckDrawLogic.java

@@ -69,8 +69,6 @@ public class PromotionLuckDrawLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         promotionLuckDrawBean.setCreateTime(new Date());
         promotionLuckDrawBean.setCreateBy(adminUser.getNickName());
-        promotionLuckDrawBean.setCompanyWechatId(adminUser.getCompanyWechatId());
-        promotionLuckDrawBean.setCompanyWechatName(adminUser.getCompanyName());
         promotionLuckDrawService.save(promotionLuckDrawBean);
         //新增优惠券
         @NotNull List<PromotionLuckDrawCouponBean> promotionLuckDrawCoupons = promotionLuckDrawBean.getPromotionLuckDrawCoupons();
@@ -117,8 +115,6 @@ public class PromotionLuckDrawLogic {
                     couponGoods.setCouponId(couponBean.getId());
                     couponGoods.setGoodsSpecId(goodsSpec.getGoodsSpecId());
                     couponGoods.setCreateTime(new Date());
-                    couponGoods.setCompanyWechatId(adminUser.getCompanyWechatId());
-                    couponGoods.setCompanyName(adminUser.getCompanyName());
                     couponGoodList.add(couponGoods);
                 }
                 couponGoodsService.saveBatch(couponGoodList);

src/main/java/com/gree/mall/manager/logic/activity/SecKillLogic.java

@@ -1,331 +0,0 @@
-package com.gree.mall.manager.logic.activity;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gree.mall.manager.bean.activity.*;
-import com.gree.mall.manager.bean.admin.AdminUserCom;
-import com.gree.mall.manager.commonmapper.SecKillMapper;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.logic.common.CommonLogic;
-import com.gree.mall.manager.plus.entity.*;
-import com.gree.mall.manager.plus.service.*;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.integration.redis.util.RedisLockRegistry;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-
-@Slf4j
-@Component
-public class SecKillLogic {
-
-    @Resource
-    SecKillActivityService secKillActivityService;
-    @Resource
-    SecKillActivitySpecService secKillActivitySpecService;
-    @Resource
-    SecKillStageService secKillStageService;
-    @Resource
-    CommonLogic commonLogic;
-    @Autowired
-    private GoodsSpecService goodsSpecService;
-    @Autowired
-    private RedisLockRegistry redisLockRegistry;
-    @Autowired
-    private SecKillMapper secKillMapper;
-    @Value("${goods.share.limit.percent}")
-    private String percentLimit;
-    @Autowired
-    private GoodsService goodsService;
-
-    public final static String LOCK_ORDER_STOCK = "mall:lock:stock";
-
-    /**
-     * 秒杀商品列表
-     *
-     * @param keyword
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    public IPage<CustomSecSpecBean> pageSpec(Integer status, String keyword, Integer pageNum, Integer pageSize, HttpServletRequest request) {
-        AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        IPage<CustomSecSpecBean> customSecSpecBeanIPage = secKillMapper.querySecSpec(new Page(pageNum, pageSize), keyword, status,adminUser.getAdminCompanyIds());
-        return customSecSpecBeanIPage;
-
-    }
-
-    public IPage<SecKillActivityStageBean> pageActivity(Integer status, String keyword, Date startTime, Integer pageNum, Integer pageSize,HttpServletRequest request) {
-        AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        IPage<SecKillActivityStageBean>  secKillActivityStageBeans = secKillMapper
-                .queryActivity(new Page(pageNum,pageSize),status, keyword, startTime, adminUser.getAdminCompanyIds());
-        return secKillActivityStageBeans;
-    }
-
-    /**
-     * 新增秒杀商品
-     *
-     * @param secKillActivityBean
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public void add(SecKillActivityBean secKillActivityBean,HttpServletRequest request) throws RemoteServiceException {
-        AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        String loginCompanyWechatId = adminUser.getLoginCompanyWechatId();
-
-        Integer count = secKillActivityService.lambdaQuery()
-                .eq(SecKillActivity::getStatus, true)
-                .eq(SecKillActivity::getDel, false)
-                .and(o1 -> o1.between(SecKillActivity::getStartTime, secKillActivityBean.getStartTime(), secKillActivityBean.getEndTime())
-                        .or(o2 -> o2.between(SecKillActivity::getEndTime, secKillActivityBean.getStartTime(), secKillActivityBean.getEndTime()))
-                        .or(o3 -> o3
-                                .lt(SecKillActivity::getStartTime,secKillActivityBean.getStartTime())
-                                .gt(SecKillActivity::getEndTime,secKillActivityBean.getEndTime()))
-                )
-                .eq(SecKillActivity::getCompanyWechatId, loginCompanyWechatId)
-                .count();
-        if (count > 0) {
-            throw new RemoteServiceException("活动时间不能重叠");
-        }
-
-        if (secKillActivityBean.getGoodsSpecs() != null) {
-            for (SecKillActivitySpecBean secKillActivitySpecBean : secKillActivityBean.getGoodsSpecs()) {
-                if (secKillActivitySpecBean.getLimitBuy() == null) {
-                    throw new RemoteServiceException("限制购买数量不能为空");
-                }
-                if (secKillActivitySpecBean.getStockNum() == null) {
-                    throw new RemoteServiceException("库存不能为空");
-                }
-                if (secKillActivitySpecBean.getStockNum() == 0) {
-                    throw new RemoteServiceException("无效库存");
-                }
-
-                if (secKillActivitySpecBean.getPrice() == null) {
-                    throw new RemoteServiceException("秒杀价格不能为空");
-                }
-                if (secKillActivitySpecBean.getPrice().compareTo(new BigDecimal(0.00)) <= 0) {
-                    throw new RemoteServiceException("无效价格");
-                }
-
-                if (secKillActivitySpecBean.getGoodsSpecId() != null) {
-                    GoodsSpec goodsSpec = goodsSpecService.getById(secKillActivitySpecBean.getGoodsSpecId());
-                    if (secKillActivitySpecBean.getStockNum() > goodsSpec.getStockNum()) {
-                        throw new RemoteServiceException(secKillActivitySpecBean.getGoodsName() + "库存超出");
-                    }
-                }
-                String goodsId=null;
-                if((goodsId=secKillActivitySpecBean.getGoodsId())==null){
-                    throw new RemoteServiceException("无效商品");
-                }
-                Goods goods = goodsService.getById(goodsId);
-                if(goods==null){
-                    throw new RemoteServiceException("无效商品");
-                }
-                if(goods.getPromotionGroup()){
-                    throw new RemoteServiceException("商品("+goods.getGoodsName()+")为团购商品无法进行秒杀");
-                }
-            }
-        }
-        Date creatDate = new Date();
-        SecKillActivity secKillActivity = new SecKillActivity();
-        BeanUtils.copyProperties(secKillActivityBean, secKillActivity);
-        secKillActivity.setCreateTime(creatDate);
-        secKillActivity.setStatus(true);
-        secKillActivity.setCompanyWechatId(adminUser.getLoginCompanyWechatId());
-        secKillActivity.setCompanyName(adminUser.getLoginCompanyName());
-        secKillActivityService.save(secKillActivity);
-        for (SecKillStage secKillStage : secKillActivityBean.getStages()) {
-            secKillStage.setSecKillId(secKillActivity.getSecKillId());
-            secKillStage.setCreateTime(creatDate);
-            secKillStage.setCompanyWechatId(adminUser.getLoginCompanyWechatId());
-            secKillStage.setCompanyName(adminUser.getLoginCompanyName());
-            secKillStageService.save(secKillStage);
-        }
-        for (SecKillActivitySpec secKillActivitySpec : secKillActivityBean.getGoodsSpecs()) {
-            secKillActivitySpec.setSecKillId(secKillActivity.getSecKillId());
-            secKillActivitySpec.setCreateTime(creatDate);
-            secKillActivitySpec.setStatus(true);
-            secKillActivitySpec.setCompanyWechatId(adminUser.getLoginCompanyWechatId());
-            secKillActivitySpec.setCompanyName(adminUser.getLoginCompanyName());
-            secKillActivitySpec.setAmount(limitShareAmount(secKillActivitySpec.getPrice(), secKillActivitySpec.getSharePercent() != null
-                    && secKillActivitySpec.getSharePercent().compareTo(new Double("0.00")) > 0 ?
-                    secKillActivitySpec.getPrice().multiply(new BigDecimal(secKillActivitySpec.getSharePercent() / 100.0)).setScale(2, BigDecimal.ROUND_DOWN)
-                    : secKillActivitySpec.getAmount()));
-            secKillActivitySpecService.save(secKillActivitySpec);
-            goodsSpecService.lambdaUpdate()
-                    .eq(GoodsSpec::getGoodsSpecId, secKillActivitySpec.getGoodsSpecId())
-                    .set(GoodsSpec::getFlag, true)
-                    .update();
-        }
-
-    }
-
-    private BigDecimal limitShareAmount(BigDecimal price, BigDecimal shareAmount) {
-        BigDecimal shareLimit = price.multiply(new BigDecimal(percentLimit));
-        return shareAmount.compareTo(shareLimit) < 1 ?
-                shareAmount.setScale(2, BigDecimal.ROUND_DOWN)
-                : shareLimit.setScale(2, BigDecimal.ROUND_DOWN);
-    }
-
-
-    /**
-     * 修改秒杀商品
-     *
-     * @param secKillActivityBean
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public void update(HttpServletRequest request, SecKillActivityBean secKillActivityBean) throws RemoteServiceException {
-        AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        String loginCompanyWechatId = adminUser.getLoginCompanyWechatId();
-
-        Integer count = secKillActivityService.lambdaQuery()
-                .ne(SecKillActivity::getSecKillId, secKillActivityBean.getSecKillId())
-                .eq(SecKillActivity::getStatus, true)
-                .eq(SecKillActivity::getDel, false)
-                .and(o1 -> o1.between(SecKillActivity::getStartTime, secKillActivityBean.getStartTime(), secKillActivityBean.getEndTime())
-                        .or(o2 -> o2.between(SecKillActivity::getEndTime, secKillActivityBean.getStartTime(), secKillActivityBean.getEndTime()))
-                        .or(o3 -> o3
-                                .lt(SecKillActivity::getStartTime,secKillActivityBean.getStartTime())
-                                .gt(SecKillActivity::getEndTime,secKillActivityBean.getEndTime()))
-                )
-                .eq(SecKillActivity::getCompanyWechatId, loginCompanyWechatId)
-                .count();
-        if (count > 0) {
-            throw new RemoteServiceException("活动时间不能重叠");
-        }
-        secKillActivityBean.setCreateTime(null);
-        secKillActivityService.updateById(secKillActivityBean);
-        secKillActivitySpecService.lambdaUpdate()
-                .eq(SecKillActivitySpec::getSecKillId, secKillActivityBean.getSecKillId())
-                .remove();
-        if (secKillActivityBean.getGoodsSpecs() != null) {
-
-            for (SecKillActivitySpec secKillActivitySpec : secKillActivityBean.getGoodsSpecs()) {
-                secKillActivitySpec.setCreateTime(new Date());
-                secKillActivitySpec.setSecKillId(secKillActivityBean.getSecKillId());
-                secKillActivitySpec.setAmount(limitShareAmount(secKillActivitySpec.getPrice(), secKillActivitySpec.getSharePercent() != null
-                        && secKillActivitySpec.getSharePercent().compareTo(new Double("0.00")) > 0 ?
-                        secKillActivitySpec.getPrice().multiply(new BigDecimal(secKillActivitySpec.getSharePercent() / 100.0)).setScale(2, BigDecimal.ROUND_DOWN)
-                        : secKillActivitySpec.getAmount()));
-                secKillActivitySpecService.save(secKillActivitySpec);
-                goodsSpecService.lambdaUpdate()
-                        .eq(GoodsSpec::getGoodsSpecId, secKillActivitySpec.getGoodsSpecId())
-                        .set(GoodsSpec::getFlag, true)
-                        .update();
-            }
-        }
-        secKillStageService.lambdaUpdate()
-                .eq(SecKillStage::getSecKillId, secKillActivityBean.getSecKillId())
-                .remove();
-        if (secKillActivityBean.getStages() != null) {
-            for (SecKillStage secKillStage : secKillActivityBean.getStages()) {
-                secKillStage.setCreateTime(new Date());
-                secKillStage.setSecKillId(secKillActivityBean.getSecKillId());
-                secKillStageService.save(secKillStage);
-            }
-        }
-    }
-
-
-    /**
-     * 更改活动状态
-     *
-     * @param secKillId
-     */
-    public void updateStatus(String secKillId, Boolean status) {
-        secKillActivityService.lambdaUpdate()
-                .eq(SecKillActivity::getSecKillId, secKillId)
-                .set(SecKillActivity::getStatus, status)
-                .update();
-    }
-
-    /**
-     * 删除秒杀商品
-     *
-     * @param secKillSpecId
-     */
-    public void specDelete(String secKillSpecId) {
-        secKillActivitySpecService.removeById(secKillSpecId);
-    }
-
-    /**
-     * 关闭秒杀商品
-     *
-     * @param secKillSpecId
-     */
-    public void specClose(String secKillSpecId) {
-        secKillActivitySpecService.lambdaUpdate()
-                .eq(SecKillActivitySpec::getSecKillSpecId, secKillSpecId)
-                .set(SecKillActivitySpec::getStatus, true)
-                .update();
-    }
-
-
-    public void updateStockNum(String secKillSpecId, Integer stockNum) {
-        SecKillActivitySpec secKillActivitySpec = secKillActivitySpecService.getById(secKillSpecId);
-        GoodsSpec goodsSpec = goodsSpecService.lambdaQuery().eq(GoodsSpec::getGoodsSpecId, secKillActivitySpec.getGoodsSpecId())
-                .one();
-        if ((secKillActivitySpec.getSecStockNum() + stockNum) > goodsSpec.getStockNum()) {
-            return;
-        }
-        String key = secKillActivitySpec.getGoodsId() + "_" + secKillActivitySpec.getSecKillId() + "_" + secKillSpecId;
-        Lock obtain = redisLockRegistry.obtain(LOCK_ORDER_STOCK + key);
-        try {
-            if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-                log.error("修改秒杀库存获取锁失败");
-            }
-            //修改库存
-            if (secKillActivitySpec != null && secKillActivitySpec.getSecStockNum() > 0) {
-                secKillActivitySpecService.lambdaUpdate()
-                        .eq(SecKillActivitySpec::getSecKillSpecId, secKillActivitySpec.getSecKillSpecId())
-                        .set(SecKillActivitySpec::getSecStockNum, secKillActivitySpec.getSecStockNum() + stockNum)
-                        .update();
-            }
-
-        } catch (Exception e) {
-            log.info("修改秒杀库存secSpecId:" + secKillSpecId, e);
-        } finally {
-            obtain.unlock();
-        }
-
-    }
-
-
-    /**
-     * 秒杀商品详情
-     *
-     * @param secKillId
-     * @return
-     */
-    public SecKillActivityBean detail(String secKillId) {
-        SecKillActivity secKillActivity = secKillActivityService.lambdaQuery()
-                .eq(SecKillActivity::getSecKillId, secKillId)
-                .one();
-        List<SecKillStage> secKillStages = secKillStageService.lambdaQuery()
-                .eq(SecKillStage::getSecKillId, secKillId)
-                .list();
-        SecKillActivityBean secKillActivityBean = new SecKillActivityBean();
-        secKillActivityBean.setStages(secKillStages);
-        BeanUtils.copyProperties(secKillActivity, secKillActivityBean);
-        secKillActivityBean.setGoodsSpecs(secKillMapper.querySecDetail(secKillId));
-        return secKillActivityBean;
-    }
-
-    public IPage<CustomSpecBean> goodsSpecList(String categoryId, String keyword, Integer pageNum, Integer pageSize,HttpServletRequest request) {
-
-        AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        IPage<CustomSpecBean> page = secKillMapper.querySpecList(new Page(pageNum, pageSize), categoryId, keyword,adminUser.getAdminCompanyIds());
-        return page;
-    }
-
-
-}

src/main/java/com/gree/mall/manager/logic/admin/AdminCompanyWechatOtherLogic.java

@@ -1,12 +1,10 @@
 package com.gree.mall.manager.logic.admin;
 
 import com.gree.mall.manager.bean.admin.AdminUserCom;
-import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.plus.entity.AdminCompanyWechatOther;
 import com.gree.mall.manager.plus.service.AdminCompanyWechatOtherService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -27,13 +25,10 @@ public class AdminCompanyWechatOtherLogic {
      */
     public AdminCompanyWechatOther getOne(HttpServletRequest request) {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        String loginCompanyWechatId = adminUser.getLoginCompanyWechatId();
-        if (StringUtils.isEmpty(loginCompanyWechatId)) {
-            return null;
-        }
+
 
         return adminCompanyWechatOtherService.lambdaQuery()
-                .eq(AdminCompanyWechatOther::getCompanyWechatId, loginCompanyWechatId)
+                .last("limit 1")
                 .one();
     }
 

src/main/java/com/gree/mall/manager/logic/admin/AdminDeptLogic.java

@@ -54,12 +54,12 @@ public class AdminDeptLogic {
         List<AdminDept> list = new ArrayList<>();
         if (!adminUser.getType().equals(1) ){
             list = adminDeptService.lambdaQuery()
-                    .in(CollectionUtil.isNotEmpty(adminUser.getAdminCompanyIds()), AdminDept::getCompanyWechatId, adminUser.getAdminCompanyIds())
+                    .in(CollectionUtil.isNotEmpty(adminUser.getAdminCompanyIds()), AdminDept::getCompanyId, adminUser.getAdminCompanyIds())
                     .eq(AdminDept::getPId, "1")
                     .list();
         }else{
             list = adminDeptService.lambdaQuery()
-                    .in(CollectionUtil.isNotEmpty(adminUser.getAdminCompanyIds()), AdminDept::getCompanyWechatId, adminUser.getCompanyWechatId())
+                    .in(CollectionUtil.isNotEmpty(adminUser.getAdminCompanyIds()), AdminDept::getCompanyId, adminUser.getCompanyId())
                     .eq(AdminDept::getAdminDeptId, "1")
                     .list();
         }
@@ -119,9 +119,9 @@ public class AdminDeptLogic {
         IPage<AdminDeptWebsitVO> adminDeptWebsitVOIPage = adminMapper.list(page, zfireParam);
         if (isAll && CollectionUtil.isEmpty(adminDeptWebsitVOIPage.getRecords())) {
             final AdminDept adminDept = adminDeptService.getById(zfireParam.getCurDeptId());
-            String companyId = Objects.nonNull(adminDept) ? adminDept.getCompanyWechatId() : null;
+            String companyId = Objects.nonNull(adminDept) ? adminDept.getCompanyId() : null;
             final List<AdminWebsit> websitList = adminWebsitService.lambdaQuery()
-                    .eq(StringUtils.isNotBlank(companyId), AdminWebsit::getCompanyWechatId, companyId)
+                    .eq(StringUtils.isNotBlank(companyId), AdminWebsit::getCompanyId, companyId)
                     .list();
             if (CollectionUtil.isNotEmpty(websitList)) {
                 List<AdminDeptWebsitVO> voList = new ArrayList<>();
@@ -146,14 +146,14 @@ public class AdminDeptLogic {
     public void add(AdminDept adminDept) {
         AdminDept adminDeptServiceById = adminDeptService.getById(adminDept.getPId());
 
-        adminDept.setCompanyWechatId(adminDeptServiceById.getCompanyWechatId());
+        adminDept.setCompanyId(adminDeptServiceById.getCompanyId());
         adminDept.setCompanyName(adminDeptServiceById.getCompanyName());
         adminDept.insert();
     }
 
     public void update(AdminDept adminDept) {
         final AdminDept dept = adminDeptService.getById(adminDept.getAdminDeptId());
-        if (dept.getPId().equals("1") && StringUtils.isNotBlank(dept.getCompanyWechatId())) {
+        if (dept.getPId().equals("1") && StringUtils.isNotBlank(dept.getCompanyId())) {
             throw new RemoteServiceException("商户名称不能变更");
         }
         adminDept.updateById();
@@ -166,7 +166,7 @@ public class AdminDeptLogic {
 
     public void del(String id) {
         final AdminDept dept = adminDeptService.getById(id);
-        if (dept.getPId().equals("1") && StringUtils.isNotBlank(dept.getCompanyWechatId())) {
+        if (dept.getPId().equals("1") && StringUtils.isNotBlank(dept.getCompanyId())) {
             throw new RemoteServiceException("商户不能删除");
         }
 
@@ -202,70 +202,6 @@ public class AdminDeptLogic {
         adminDeptWebsitService.removeById(adminDeptWebsitId);
     }
 
-    public List<AdminDeptTree> treeWebsit(HttpServletRequest request) {
-
-        AdminUserCom adminUser = commonLogic.getAdminUser(request);
-
-        List<AdminDeptTree> trees = new ArrayList<>();
-        if (adminUser.getType() == 2 || adminUser.getType() == 4) {
-            // 商家账号只返回商家
-            List<AdminWebsit> adminWebsitList = adminWebsitService.lambdaQuery()
-                    .eq(AdminWebsit::getCompanyWechatId, adminUser.getLoginCompanyWechatId())
-                    .in(AdminWebsit::getWebsitId, adminUser.getAdminWebsitIds())
-                    .list();
-            if (CollectionUtil.isEmpty(adminWebsitList)) {
-                return trees;
-            }
-            for (AdminWebsit websit : adminWebsitList) {
-                AdminDeptTree deptTree = new AdminDeptTree();
-                deptTree.setIsWebsit(true);
-                deptTree.setCompanyWechatId(websit.getCompanyWechatId());
-                deptTree.setCompanyName(websit.getCompanyName());
-                deptTree.setAdminDeptId(websit.getWebsitId());
-                deptTree.setDeptName(websit.getName());
-                trees.add(deptTree);
-            }
-            return trees;
-        }
-
-        List<AdminDept> list = adminDeptService.lambdaQuery()
-                .eq(AdminDept::getPId, "0")
-                .list();
-
-        for (AdminDept adminDept : list) {
-            AdminDeptTree adminDeptTree = new AdminDeptTree();
-            BeanUtils.copyProperties(adminDept, adminDeptTree);
-            trees.add(adminDeptTree);
-        }
-
-        for (AdminDeptTree adminDeptTree : trees) {
-            adminDeptTree.setChildren(this.treeModule(adminDeptTree.getAdminDeptId()));
-
-            List<AdminDeptTree> children = adminDeptTree.getChildren();
-            for (AdminDeptTree child : children) {
-                List<AdminDeptWebsit> adminDeptWebsits = adminDeptWebsitService.lambdaQuery().eq(AdminDeptWebsit::getAdminDeptId, child.getAdminDeptId()).list();
-
-                for (AdminDeptWebsit adminDeptWebsit : adminDeptWebsits) {
-                    AdminDeptTree adminDeptTreeWebsit = new AdminDeptTree();
-                    adminDeptTreeWebsit.setIsWebsit(true);
-                    adminDeptTreeWebsit.setAdminDeptId(adminDeptWebsit.getWebsitId());
-                    adminDeptTreeWebsit.setDeptName(adminDeptWebsit.getWebsitName());
-
-                    child.getChildren().add(adminDeptTreeWebsit);
-
-                }
-                AdminWebsit adminWebsit = adminWebsitService.lambdaQuery().eq(AdminWebsit::getName, child.getDeptName()).last("limit 1").one();
-
-                if (adminWebsit != null) {
-                    child.setAdminDeptId(adminWebsit.getWebsitId());
-                    child.setIsWebsit(true);
-                }
-            }
-        }
-
-        return trees;
-    }
-
     public void addWebsit(String adminDeptId, List<String> websitIds) {
         AdminDept adminDept = adminDeptService.getById(adminDeptId);
 
@@ -273,8 +209,8 @@ public class AdminDeptLogic {
                 .in(AdminWebsit::getWebsitId, websitIds)
                 .list();
 
-        if (adminDept.getPId().equals("1") && StringUtils.isNotBlank(adminDept.getCompanyWechatId())) {
-            final long count = adminWebsits.stream().filter(v -> !v.getCompanyWechatId().equals(adminDept.getCompanyWechatId())).count();
+        if (adminDept.getPId().equals("1") && StringUtils.isNotBlank(adminDept.getCompanyId())) {
+            final long count = adminWebsits.stream().filter(v -> !v.getCompanyId().equals(adminDept.getCompanyId())).count();
             if (count > 0) {
                 throw new RemoteServiceException("不同商户的商家不能添加");
             }
@@ -325,8 +261,8 @@ public class AdminDeptLogic {
             for (AdminDept adminDept : adminDeptList) {
                 final AdminWebsit websit = websitMap.get((String) row.get(0));
                 // 不是平台的需要判断商家是否能放入商户下面
-                if (!adminDept.getCompanyWechatId().equals("0")
-                        && !websit.getCompanyWechatId().equals(adminDept.getCompanyWechatId())) {
+                if (!adminDept.getCompanyId().equals("0")
+                        && !websit.getCompanyId().equals(adminDept.getCompanyId())) {
                     throw new RemoteServiceException("第" + index + "行, 商家不能添加到到对应部门");
                 }
                 AdminDeptWebsit adminDeptWebsit = new AdminDeptWebsit();

src/main/java/com/gree/mall/manager/logic/admin/AdminRoleLogic.java

@@ -38,15 +38,15 @@ public class AdminRoleLogic {
      */
     public IPage<AdminRole> listPage(HttpServletRequest request, String companyWechatName, String adminCompanyId, Integer type, Integer pageNo, Integer pageSize) {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
+        List<String> companyIds = adminUser.getAdminCompanyIds();
 
         Integer userType = this.checkUserType(adminUser);
 
         return adminRoleService.lambdaQuery()
                 .eq(StringUtils.isNotBlank(companyWechatName), AdminRole::getCompanyName, companyWechatName)
-                .eq(StringUtils.isNotBlank(adminCompanyId), AdminRole::getCompanyWechatId, adminCompanyId)
+                .eq(StringUtils.isNotBlank(adminCompanyId), AdminRole::getCompanyId, adminCompanyId)
                 .eq(Objects.nonNull(type), AdminRole::getType, type)
-                .in(CollectionUtils.isNotEmpty(companyWechatIds), AdminRole::getCompanyWechatId, companyWechatIds)
+                .in(CollectionUtils.isNotEmpty(companyIds), AdminRole::getCompanyId, companyIds)
                 .eq(userType > 0, AdminRole::getType, userType)
                 .orderByAsc(AdminRole::getType)
                 .page(new Page<>(pageNo, pageSize));
@@ -81,8 +81,8 @@ public class AdminRoleLogic {
             adminRole.setParentRoleName(parentRole.getName());
         }
 
-        if (StringUtils.isNotBlank(adminRole.getCompanyWechatId())) {
-            final AdminCompany company = adminCompanyService.getById(adminRole.getCompanyWechatId());
+        if (StringUtils.isNotBlank(adminRole.getCompanyId())) {
+            final AdminCompany company = adminCompanyService.getById(adminRole.getCompanyId());
             adminRole.setCompanyName(company.getAdminCompanyName());
         }
 

src/main/java/com/gree/mall/manager/logic/admin/AdminUserLogic.java

@@ -304,7 +304,7 @@ public class AdminUserLogic {
             AdminUserPermissionsRela rela = new AdminUserPermissionsRela();
             rela.setAdminUserId(adminUser.getAdminUserId())
                     .setAdminUserPermissionsId(adminDept.getAdminDeptId())
-                    .setCompanyWechatId(adminDept.getCompanyWechatId())
+                    .setCompanyId(adminDept.getCompanyId())
                     .setIsDept(true);
             relaList.add(rela);
         }
@@ -312,7 +312,7 @@ public class AdminUserLogic {
             AdminUserPermissionsRela rela = new AdminUserPermissionsRela();
             rela.setAdminUserId(adminUser.getAdminUserId())
                     .setAdminUserPermissionsId(adminWebsit.getWebsitId())
-                    .setCompanyWechatId(adminWebsit.getCompanyWechatId())
+                    .setCompanyId(adminWebsit.getCompanyId())
                     .setIsDept(false);
             relaList.add(rela);
         }
@@ -340,7 +340,7 @@ public class AdminUserLogic {
                 .ne(!adminUser.getUserName().equals("admin"), AdminUser::getUserName, "admin")
                 .eq(StringUtils.isNotEmpty(roleId), AdminUser::getRoleId, roleId)
                 .eq(status != null, AdminUser::getStatus, status)
-                .in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()), AdminUser::getCompanyWechatId, adminUser.getAdminCompanyIds())
+                .in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()), AdminUser::getCompanyId, adminUser.getAdminCompanyIds())
                 .like(StringUtils.isNotEmpty(userName), AdminUser::getUserName, userName)
                 .page(new Page<>(pageNum, pageSize));
         return page;

src/main/java/com/gree/mall/manager/logic/admin/AdminWebsitLogic.java

@@ -87,7 +87,7 @@ public class AdminWebsitLogic {
 
         List<AdminWebsitTree> parentList = trees.stream().filter(x -> x.getParentId() == 0).collect(Collectors.toList());
         for(AdminWebsitTree adminWebsit:parentList){
-            adminWebsit.setChildren(this.treeModule(trees,adminWebsit.getWebsitId(),adminWebsit.getCompanyWechatId()));
+            adminWebsit.setChildren(this.treeModule(trees,adminWebsit.getWebsitId(),adminWebsit.getCompanyId()));
         }
         return parentList;
     }
@@ -109,10 +109,10 @@ public class AdminWebsitLogic {
             throw new RemoteServiceException("部门名称或部门编号已存在");
         }
 
-        if (StringUtil.isEmpty(adminWebsit.getCompanyWechatId()))
+        if (StringUtil.isEmpty(adminWebsit.getCompanyId()))
             throw new RemoteServiceException("上级商家不能为空");
         AdminCompanyWechat adminCompanyWechat = adminCompanyWechatService.getById(adminWebsit.getPayWorkerCodeId());
-        AdminCompanyWechat adminCompanyWechatP = adminCompanyWechatService.getById(adminWebsit.getCompanyWechatId());
+        AdminCompanyWechat adminCompanyWechatP = adminCompanyWechatService.getById(adminWebsit.getCompanyId());
 
 
         adminWebsit.setWebsitId(adminWebsit.getWebsitNumber());
@@ -130,7 +130,7 @@ public class AdminWebsitLogic {
         adminUserBean.setRoleName("网点");
         adminUserBean.setWebsitId(adminWebsit.getWebsitId());
         adminUserBean.setWebsitName(adminWebsit.getName());
-        adminUserBean.setCompanyWechatId(adminWebsit.getCompanyWechatId());
+        adminUserBean.setCompanyId(adminWebsit.getCompanyId());
         adminUserBean.setCompanyName(adminWebsit.getCompanyName());
         adminUserBean.setAddress(adminWebsit.getAddress());
         adminUserBean.setType(2);
@@ -164,10 +164,10 @@ public class AdminWebsitLogic {
             throw new RemoteServiceException("部门名称或部门编号已存在");
         }
 
-        if (StringUtil.isEmpty(adminWebsit.getCompanyWechatId()))
+        if (StringUtil.isEmpty(adminWebsit.getCompanyId()))
             throw new RemoteServiceException("上级商家不能为空");
         AdminCompanyWechat adminCompanyWechat = adminCompanyWechatService.getById(adminWebsit.getPayWorkerCodeId());
-        AdminCompanyWechat adminCompanyWechatP = adminCompanyWechatService.getById(adminWebsit.getCompanyWechatId());
+        AdminCompanyWechat adminCompanyWechatP = adminCompanyWechatService.getById(adminWebsit.getCompanyId());
         adminWebsit.setCompanyName(adminCompanyWechatP.getCompanyName());
         adminWebsit.setPayWorkerCodeName(adminCompanyWechat.getCompanyName());
         adminWebsit.updateById();
@@ -243,12 +243,12 @@ public class AdminWebsitLogic {
             return null;
         }
         List<AdminWebsitTree> collect = list.stream()
-                .filter(e -> e.getParentId().equals(parentId) && e.getCompanyWechatId().equals(companyId)).collect(Collectors.toList());
+                .filter(e -> e.getParentId().equals(parentId) && e.getCompanyId().equals(companyId)).collect(Collectors.toList());
         if(collect.size() == 0){
             return null;
         }
         for(AdminWebsitTree bean : collect){
-            bean.setChildren(this.treeModule(list, bean.getWebsitId(),bean.getCompanyWechatId()));
+            bean.setChildren(this.treeModule(list, bean.getWebsitId(),bean.getCompanyId()));
         }
         return collect;
     }
@@ -286,7 +286,7 @@ public class AdminWebsitLogic {
                 throw new RemoteServiceException("第"+rowIndex+"行，找不到上级商户");
 
             adminWebsit.setCompanyName(oneP.getCompanyName());
-            adminWebsit.setCompanyWechatId(oneP.getCompanyWechatId());
+            adminWebsit.setCompanyId(oneP.getCompanyWechatId());
             adminWebsit.setWebsitId((String) row.get(1));
             adminWebsit.setWebsitNumber((String) row.get(1));
             adminWebsit.setName((String) row.get(2));
@@ -349,7 +349,7 @@ public class AdminWebsitLogic {
             adminUserBean.setRoleName("网点");
             adminUserBean.setWebsitId(adminWebsit.getWebsitId());
             adminUserBean.setWebsitName(adminWebsit.getName());
-            adminUserBean.setCompanyWechatId(adminWebsit.getCompanyWechatId());
+            adminUserBean.setCompanyId(adminWebsit.getCompanyId());
             adminUserBean.setCompanyName(adminWebsit.getCompanyName());
             adminUserBean.setAddress(adminWebsit.getAddress());
             adminUserBean.setType(2);

src/main/java/com/gree/mall/manager/logic/admin/OperationLogLogic.java

@@ -32,7 +32,7 @@ public class OperationLogLogic {
         List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         return operationLogService.lambdaQuery()
-                .in(CollectionUtils.isNotEmpty(companyWechatIds),OperationLog::getCompanyWechatId,companyWechatIds)
+                .in(CollectionUtils.isNotEmpty(companyWechatIds),OperationLog::getCompanyId,companyWechatIds)
                 .like(OperationLog::getModuleName,moduleName)
                 .between(StringUtils.isNotEmpty(startTime) && StringUtils.isNotEmpty(endTime),
                         OperationLog::getCreateTime,startTime,endTime)
@@ -49,7 +49,7 @@ public class OperationLogLogic {
 
         List<OperationLog> distinctModuleName = operationLogService.lambdaQuery()
                 .select(OperationLog::getModuleName)
-                .in(CollectionUtils.isNotEmpty(companyWechatIds),OperationLog::getCompanyWechatId,companyWechatIds)
+                .in(CollectionUtils.isNotEmpty(companyWechatIds),OperationLog::getCompanyId,companyWechatIds)
                 .groupBy(OperationLog::getModuleName)
                 .list();
         if(distinctModuleName.size() == 0){

src/main/java/com/gree/mall/manager/logic/common/CommonLogic.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSON;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.commonmapper.AdminMapper;
 import com.gree.mall.manager.config.wx.WxConfiguration;
-import com.gree.mall.manager.constant.Constant;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.plus.entity.*;
 import com.gree.mall.manager.plus.service.*;
@@ -136,7 +135,7 @@ public class CommonLogic {
 
         // 商户
         final List<String> companyList = permissionsRelas.stream()
-                .map(AdminUserPermissionsRela::getCompanyWechatId)
+                .map(AdminUserPermissionsRela::getCompanyId)
                 .distinct()
                 .collect(Collectors.toList());
         adminUserCom.setAdminCompanyIds(companyList);
@@ -295,9 +294,6 @@ public class CommonLogic {
     }
 
     public String getUrlScheme(String query, String companyWechatId) throws IOException, WxErrorException {
-        if (StringUtils.isEmpty(companyWechatId)) {
-            companyWechatId = Constant.GD_COMPANY_WECHAT_ID;
-        }
         String accessToken = wechatLogic.getMaService(companyWechatId).getAccessToken();
         HttpPost httpPost = new HttpPost("https://api.weixin.qq.com/wxa/generatescheme?access_token=" + accessToken);
         httpPost.setHeader("Content-Type", "application/json; charset=utf-8");

src/main/java/com/gree/mall/manager/logic/common/FucaiLogic.java

@@ -1,65 +0,0 @@
-package com.gree.mall.manager.logic.common;
-
-import cn.hutool.core.collection.CollectionUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.aliyuncs.utils.StringUtils;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.FeignResponseObject;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.plus.entity.GoodsSpec;
-import com.gree.mall.manager.utils.HttpUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Service
-public class FucaiLogic {
-
-    @Value("${fucai.wuliao.url}")
-    private String wuliaoUrl;
-    @Value("${spring.profiles.active}")
-    private String profiles;
-
-
-    public void getWuliao(List<GoodsSpec> goodsSpecs) throws RemoteServiceException {
-        if(CollectionUtil.isEmpty(goodsSpecs)){
-            return;
-        }
-        if(!profiles.equals("prd")){
-            return;
-        }
-        for(GoodsSpec goodsSpec : goodsSpecs){
-            this.getWuliao(goodsSpec);
-        }
-    }
-
-    /**
-     * 查询金蝶物料
-     */
-    public void getWuliao(GoodsSpec goodsSpec) throws RemoteServiceException {
-        if(StringUtils.isEmpty(goodsSpec.getGoodsCode())){
-            return;
-        }
-
-        Map<String, String> map = new HashMap<>();
-        map.put("number", goodsSpec.getGoodsCode());
-        String s = HttpUtils.requestGet(wuliaoUrl, map, null);
-        FeignResponseObject feignResponseObject = JSONObject.parseObject(s, FeignResponseObject.class);
-        List<Map<String, Object>> data = (List<Map<String, Object>>) feignResponseObject.checkOutData();
-        if (data == null || data.size() == 0) {
-            throw new RemoteServiceException("请检查物料编码是否正确");
-        }
-        String name = (String) data.get(0).get("name");
-        BigDecimal tax = (BigDecimal) data.get(0).get("taxRateId");
-        String unit = (String) data.get(0).get("salePriceUnitId");
-        goodsSpec.setJindName(name);
-        goodsSpec.setJindTax(tax.divide(BigDecimal.valueOf(100)));
-        goodsSpec.setJindUnit(unit);
-
-    }
-
-}

src/main/java/com/gree/mall/manager/logic/common/GongdanLogic.java

@@ -1,578 +0,0 @@
-package com.gree.mall.manager.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.manager.bean.order.OrderDetailBean;
-import com.gree.mall.manager.bean.order.WorkerOrderInfo;
-import com.gree.mall.manager.commonmapper.CustomGoodsMapper;
-import com.gree.mall.manager.constant.Constant;
-import com.gree.mall.manager.enums.WorkOrderTypeEnum;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.plus.entity.GoodsCategory;
-import com.gree.mall.manager.plus.entity.OrderDetail;
-import com.gree.mall.manager.plus.entity.OrderInfo;
-import com.gree.mall.manager.plus.entity.OrderRequest;
-import com.gree.mall.manager.plus.service.GoodsCategoryService;
-import com.gree.mall.manager.plus.service.OrderDetailService;
-import com.gree.mall.manager.plus.service.OrderInfoService;
-import com.gree.mall.manager.plus.service.OrderRequestService;
-import com.gree.mall.manager.utils.AESUtils;
-import com.gree.mall.manager.utils.HttpUtils;
-import com.gree.mall.manager.utils.RedisUtil;
-import com.gree.mall.manager.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.marketing.url}")
-    private String marketingUrl;
-    @Value("${gongdan.smalltype.url}")
-    private String smallTypeUrl;
-    @Value("${gongdan.client_name}")
-    private String clientName;
-    @Value("${gongdan.password}")
-    private String password;
-    @Value("${gongdan.key}")
-    private String key;
-    @Value("${spring.profiles.active}")
-    private String profiles;
-
-    @Autowired
-    OrderInfoService orderInfoService;
-    @Autowired
-    OrderDetailService orderDetailService;
-    @Autowired
-    OrderRequestService orderRequestService;
-    @Autowired
-    CustomGoodsMapper customGoodsMapper;
-    @Autowired
-    GoodsCategoryService goodsCategoryService;
-
-    @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");
-        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;
-    }
-
-    /**
-     * 获取小类
-     */
-    public List getSmallType(String mainNumber,String categoryId) throws Exception {
-        GoodsCategory goodsCategory = goodsCategoryService.getById(categoryId);
-
-        Map<String, Object> map = new HashMap<>();
-        map.put("main_id", mainNumber);
-        map.put("pageNumber",1);
-        map.put("pageSize",100);
-        if(StringUtils.equals(goodsCategory.getWorkOrderType(),WorkOrderTypeEnum.REPAIR.toString())){
-            map.put("worker_type","2");
-        }else{
-            map.put("worker_type","1");
-        }
-        Map<String, String> header = new HashMap<>();
-        header.put("Authorization", this.getGongdanToken());
-        JSONObject jsonObject = this.doPhpSevice(map, header, smallTypeUrl);
-        JSONObject data = (JSONObject)jsonObject.get("data");
-        return (List<Map<String,Object>>)data.get("data");
-    }
-
-    /**
-     * 获取营销活动
-     */
-    public List<Map<String,Object>> getMarketingList(Integer type) throws Exception {
-        try {
-            if(!profiles.equals("prd")){
-                return new ArrayList<>();
-            }
-            Map<String, Object> map = new HashMap<>();
-            map.put("type", type);
-            Map<String, String> header = new HashMap<>();
-            header.put("Authorization", this.getGongdanToken());
-            JSONObject jsonObject = this.doPhpSevice(map, header, marketingUrl);
-            return (List<Map<String, Object>>) jsonObject.get("data");
-        }catch(Exception e){
-            log.error("获取工单系统营销活动失败",e);
-            return new ArrayList<>();
-        }
-    }
-
-    /**
-     * 创建安装工单
-     * @param orderInfo
-     * @param orderDetailList
-     * @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);
-            }
-            if (orderInfo.getPayTime() != null) {
-                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.isNotEmpty(orderInfo.getWorkerPhone()) && orderInfo.getCompanyWechatId().equals(Constant.GD_COMPANY_WECHAT_ID)){
-                remark += "师傅名称:"+orderInfo.getWorkerName() + "(" + orderInfo.getWorkerPhone() + ")";
-            }
-            if(StringUtils.isNotEmpty(orderInfo.getBuyerMsg())){
-                remark += ",买家留言:"+orderInfo.getBuyerMsg();
-            }
-            if(StringUtils.isNotEmpty(orderInfo.getRemark())){
-                remark +=",商家备注："+orderInfo.getRemark();
-            }
-            if(StringUtils.isNotBlank(orderInfo.getDispatchType())){
-                remark +=",工单派单方式："+orderInfo.getDispatchType();
-            }
-            if (StringUtils.isNotEmpty(remark)) {
-                map.put("remark", remark);
-            }
-            if(marketingId != null && marketingId !=0) {
-                map.put("marketing_id", marketingId);
-            }
-            List<String> orderDetailIds = new ArrayList<>();
-            List<Map<String, Object>> productList = 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.isEmpty(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");
-            Integer workerOrderId = (Integer)data.get("id");
-            String workerOrderNo = (String) data.get("worker_order_no");
-
-            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 "";
-    }
-
-    /**
-     * 创建维修工单
-     * @param orderInfo
-     * @param detail
-     * @throws Exception
-     */
-    @Async
-    public void repairOrder(OrderInfo orderInfo, OrderDetail detail) throws Exception {
-        if(!orderInfo.getWorkOrder()){
-            return ;
-        }
-        //检查是否都已退款
-        if(detail.getNum() <= detail.getRefundNum()){
-            return;
-        }
-        //查询商品分类
-        GoodsCategory goodsCategory = customGoodsMapper.queryGoodsCategoryByGoodsId(detail.getGoodsId());
-        String skillTagId = "1";
-        if(StringUtils.equals(goodsCategory.getName(),"家用中央空调清洗")){
-            skillTagId = "2";
-        }
-
-        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());
-        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());
-
-        List<Map<String,Object>> productList = new ArrayList<>();
-        Map<String, Object> pMap = new HashMap<>();
-        pMap.put("name",detail.getGoodsName());
-        pMap.put("main_id",detail.getMainNumber());
-        pMap.put("small_id",StringUtils.isEmpty(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());
-
-        String remark = "商品名称:"+detail.getGoodsName()+"，规格："+detail.getGoodsSpecValue()+"，数量："+pMap.get("number")+",总金额："+pMap.get("price");
-        remark += ",买家留言："+orderInfo.getBuyerMsg()+",商家备注："+orderInfo.getRemark();
-        pMap.put("description",remark);
-        productList.add(pMap);
-        map.put("product_list",productList);
-        map.put("remark",remark);
-        map.put("marketing_id",detail.getMarketingId());
-        if(orderInfo.getCompanyWechatId().equals("1")) {
-            map.put("order_source", 7);//3=分销商城
-        }else{
-            map.put("order_source",8);
-        }
-        map.put("skill_tag_id",skillTagId);
-        //map.put("sale_type","1");
-        map.put("type_id",goodsCategory.getDemandTypeId());
-        map.put("small_type_id",goodsCategory.getDemandSmallTypeId());
-        Map<String,String> header = new HashMap<>();
-        header.put("Authorization",this.getGongdanToken());
-
-        JSONObject jsonObject  = this.doPhpSevice(map, header, createRepairUrl);
-
-        JSONObject data = (JSONObject)jsonObject.get("data");
-        Integer workerOrderId = (Integer)data.get("id");
-        String workerOrderNo = (String)data.get("worker_order_no");
-
-        OrderRequest orderRequest = new OrderRequest();
-        orderRequest.setCreateTime(new Date());
-        orderRequest.setMainNumber(detail.getMainNumber());
-        orderRequest.setOrderId(orderInfo.getOrderId());
-        orderRequest.setOrderType("REPAIR");
-        orderRequest.setUserId(orderInfo.getUserId());
-        orderRequest.setWorkerOrderId(workerOrderId);
-        orderRequest.setWorkerOrderNo(workerOrderNo);
-        orderRequest.insert();
-
-        detail.setWorkerOrderNo(workerOrderNo);
-        detail.updateById();
-    }
-
-
-    /**
-     * 安装工单列表
-     */
-    public List<WorkerOrderInfo> getInstallOrderList(String orderId) throws Exception {
-
-        List<WorkerOrderInfo> workerOrderInfos = new ArrayList<>();
-        try{
-            Map<String,Object> map = new HashMap<>();
-            map.put("request_order_no",orderId);
-            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.setOrderState(data.getString("order_state_text"));
-                workerOrderInfo.setOrderStateInt(data.getInteger("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"));
-                //辅助人员
-                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((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.getMessage());
-        }
-        return workerOrderInfos;
-
-    }
-
-
-    /**
-     * 维修工单列表
-     */
-    public List<WorkerOrderInfo> getRepairOrderList(String orderId) throws Exception {
-
-        List<WorkerOrderInfo> workerOrderInfos = new ArrayList<>();
-        try {
-            Map<String, Object> map = new HashMap<>();
-            map.put("request_order_no", orderId);
-            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_name"));
-                workerOrderInfo.setOrderState(data.getString("order_state_text"));
-                workerOrderInfo.setOrderStateInt(data.getInteger("order_state"));
-                workerOrderInfo.setOrderReceTime(data.getString("receive_time_text"));
-                workerOrderInfo.setFinishTime(data.getString("finish_time_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"));
-                //操作类型
-                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.getMessage());
-        }
-        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;
-    }
-
-
-
-
-
-
-}

src/main/java/com/gree/mall/manager/logic/common/SysDictCompanyLogic.java

@@ -152,7 +152,7 @@ public class SysDictCompanyLogic {
         }
         List<SysDictCompany> dictList = sysDictCompanyService.lambdaQuery()
                 .eq(SysDictCompany::getDictType, type)
-                .eq(SysDictCompany::getCompanyWechatId,companyWechatId)
+                .eq(SysDictCompany::getCompanyId,companyWechatId)
                 .orderByDesc(SysDictCompany::getSortNum)
                 .list();
 
@@ -171,7 +171,7 @@ public class SysDictCompanyLogic {
             param.setDictCode(IdWorker.getIdStr());
         }
 
-        checkRepeatDictCode(param.getDictType(), param.getDictValue(), param.getCompanyWechatId(),param.getDictCode());
+        checkRepeatDictCode(param.getDictType(), param.getDictValue(), param.getCompanyId(),param.getDictCode());
         sysDictCompanyService.save(param);
     }
 
@@ -283,7 +283,7 @@ public class SysDictCompanyLogic {
 //            sysDictCompany.setCompanyWechatId(adminUser.getCompanyWechatId());
             sysDictCompany.setDictCode(IdWorker.getIdStr());
 
-            checkRepeatDictCode(sysDictCompany.getDictType(), sysDictCompany.getDictValue(), sysDictCompany.getCompanyWechatId(),sysDictCompany.getDictCode());
+            checkRepeatDictCode(sysDictCompany.getDictType(), sysDictCompany.getDictValue(), sysDictCompany.getCompanyId(),sysDictCompany.getDictCode());
 
             sysDictCompanyList.add(sysDictCompany);
         }

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

@@ -2,13 +2,11 @@ package com.gree.mall.manager.logic.coupon;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
-import com.aliyuncs.ram.model.v20150501.GetUserResponse;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.ExcelData;
 import com.gree.mall.manager.bean.activity.CustomSecSpecBean;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
-import com.gree.mall.manager.bean.admin.AdminWebsitVO;
 import com.gree.mall.manager.bean.coupon.*;
 import com.gree.mall.manager.commonmapper.CouponDateMapper;
 import com.gree.mall.manager.commonmapper.SecKillMapper;
@@ -153,11 +151,9 @@ public class CouponLogic {
         couponBean.setFlag(CouponFlagEnum.WAIT.toString());
         couponBean.setLeftAmount(couponBean.getCouponAmount());
         couponBean.setCreateTime(new Date());
-        couponBean.setCompanyWechatId(adminUser.getLoginCompanyWechatId());
-        couponBean.setCompanyName(adminUser.getLoginCompanyName());
         couponBean.setActiveType(2);
         couponBean.setCompanyName(adminUser.getCompanyName());
-        couponBean.setCompanyWechatId(adminUser.getCompanyWechatId());
+        couponBean.setCompanyId(adminUser.getCompanyId());
         couponService.save(couponBean);
         String couponId = couponBean.getCouponId();
         if (couponBean.getCouponType().trim().equals(CouponTypeEnum.GOODS.getKey()) && couponBean.getGoodsList() != null) {
@@ -165,8 +161,8 @@ public class CouponLogic {
             for (CouponGoods couponGoods : couponBean.getGoodsList()) {
                 couponGoods.setCouponId(couponId);
                 couponGoods.setCreateTime(new Date());
-                couponGoods.setCompanyWechatId(adminUser.getLoginCompanyWechatId());
-                couponGoods.setCompanyName(adminUser.getLoginCompanyName());
+                couponGoods.setCompanyId(adminUser.getCompanyId());
+                couponGoods.setCompanyName(adminUser.getCompanyName());
                 couponGoodsList.add(couponGoods);
             }
             couponGoodsService.saveBatch(couponGoodsList);
@@ -182,8 +178,8 @@ public class CouponLogic {
                 couponUser.setUserId(couponUserTypeBean.getUserId());
                 couponUser.setUserName(couponUserTypeBean.getUserName());
                 couponUser.setCreateTime(new Date());
-                couponUser.setCompanyName(adminUser.getLoginCompanyName());
-                couponUser.setCompanyWechatId(adminUser.getLoginCompanyWechatId());
+                couponUser.setCompanyName("");
+                couponUser.setCompanyId("");
                 couponUserList.add(couponUser);
 //                if (couponUserTypeBean.getType().equals(UserTypeEnum.SERVICE.toString())) {
 //                    userCouponList.add(assignCoupon(adminUser, couponBean, couponUserTypeBean.getUserId()));
@@ -205,7 +201,6 @@ public class CouponLogic {
             List<UserCoupon> userCouponList = new ArrayList<>();
             List<User> userList = userService.lambdaQuery()
                     .eq(User::getType, UserTypeEnum.SERVICE.toString())
-                    .eq(User::getCompanyWechatId, adminUser.getLoginCompanyWechatId())
                     .list();
             List<CouponUser> couponUserList = new ArrayList<>();
             for (User user : userList) {
@@ -215,8 +210,6 @@ public class CouponLogic {
                 couponUser.setUserId(user.getUserId());
                 couponUser.setUserName(user.getNickName());
                 couponUser.setCreateTime(new Date());
-                couponUser.setCompanyWechatId(adminUser.getLoginCompanyWechatId());
-                couponUser.setCompanyName(adminUser.getLoginCompanyName());
                 couponUserList.add(couponUser);
             }
             if (userCouponList.size() > 0) {
@@ -231,7 +224,6 @@ public class CouponLogic {
             List<CouponUser> couponUserList = new ArrayList<>();
             List<User> userList = userService.lambdaQuery()
                     .eq(User::getType, UserTypeEnum.GENERAL.toString())
-                    .eq(User::getCompanyWechatId, adminUser.getLoginCompanyWechatId())
                     .list();
             for (User user : userList) {
                 CouponUser couponUser = new CouponUser();
@@ -239,8 +231,6 @@ public class CouponLogic {
                 couponUser.setUserId(user.getUserId());
                 couponUser.setUserName(user.getNickName());
                 couponUser.setCreateTime(new Date());
-                couponUser.setCompanyWechatId(adminUser.getLoginCompanyWechatId());
-                couponUser.setCompanyName(adminUser.getLoginCompanyName());
                 couponUserList.add(couponUser);
             }
             if (couponUserList.size() > 0) {
@@ -254,8 +244,6 @@ public class CouponLogic {
 
     private UserCoupon assignCoupon(AdminUserCom adminUserCom,CouponBean couponBean, String userId) {
         UserCoupon userCoupon = new UserCoupon();
-        userCoupon.setCompanyWechatId(adminUserCom.getLoginCompanyWechatId());
-        userCoupon.setCouponName(adminUserCom.getLoginCompanyName());
         userCoupon.setCouponId(couponBean.getCouponId());
         userCoupon.setUserId(userId);
         userCoupon.setReceiveTime(new Date());
@@ -289,8 +277,6 @@ public class CouponLogic {
 
     public void reissueCoupon(HttpServletRequest request, ReissueCouponBean reissueCouponBean) throws RemoteServiceException {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        String loginCompanyWechatId = adminUser.getLoginCompanyWechatId();
-        String loginCompanyName = adminUser.getLoginCompanyName();
 
         Coupon coupon = couponService.getById(reissueCouponBean.getCouponId());
         if (coupon == null) {
@@ -304,7 +290,7 @@ public class CouponLogic {
         }
         List<CouponUserTypeBean> userIds = reissueCouponBean.getUserIds();
         if (CollectionUtils.isEmpty(userIds)) {
-            userIds = couponDateMapper.reissueCouponUser(loginCompanyWechatId,coupon.getCouponId());
+            userIds = couponDateMapper.reissueCouponUser(null,coupon.getCouponId());
         }
         List<CouponUser> couponUserList = new ArrayList<>();
         List<UserCoupon> userCouponList = new ArrayList<>();
@@ -314,8 +300,6 @@ public class CouponLogic {
             couponUser.setUserId(couponUserTypeBean.getUserId());
             couponUser.setUserName(couponUserTypeBean.getUserName());
             couponUser.setCreateTime(new Date());
-            couponUser.setCompanyWechatId(loginCompanyWechatId);
-            couponUser.setCompanyName(loginCompanyName);
             couponUserList.add(couponUser);
             CouponBean couponBean = new CouponBean();
             BeanUtils.copyProperties(coupon, couponBean);
@@ -341,8 +325,6 @@ public class CouponLogic {
     @Transactional(rollbackFor = Exception.class)
     public void update(HttpServletRequest request, CouponBean couponBean) throws RemoteServiceException {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        String loginCompanyName = adminUser.getLoginCompanyName();
-        String loginCompanyWechatId = adminUser.getLoginCompanyWechatId();
 
         Coupon coupon = couponService.getById(couponBean.getCouponId());
         couponBean.setCreateTime(null);
@@ -357,8 +339,6 @@ public class CouponLogic {
                 for (CouponGoods couponGoods : couponBean.getGoodsList()) {
                     couponGoods.setCouponId(couponBean.getCouponId());
                     couponGoods.setCreateTime(now);
-                    couponGoods.setCompanyWechatId(loginCompanyWechatId);
-                    couponGoods.setCompanyName(loginCompanyName);
                     couponGoodsService.save(couponGoods);
                 }
             }
@@ -370,8 +350,6 @@ public class CouponLogic {
                 for (CouponTag couponTag : couponBean.getTagList()) {
                     couponTag.setCouponId(couponBean.getCouponId());
                     couponTag.setCreateTime(now);
-                    couponTag.setCompanyWechatId(loginCompanyWechatId);
-                    couponTag.setCompanyName(loginCompanyName);
                     couponTagService.save(couponTag);
                 }
             }
@@ -387,8 +365,6 @@ public class CouponLogic {
                     couponUser.setUserId(couponUserTypeBean.getUserId());
                     couponUser.setUserName(couponUserTypeBean.getUserName());
                     couponUser.setCreateTime(new Date());
-                    couponUser.setCompanyWechatId(loginCompanyWechatId);
-                    couponUser.setCompanyName(loginCompanyName);
                     couponUserList.add(couponUser);
                     if (couponUserTypeBean.getType().equals(UserTypeEnum.SERVICE.toString())) {
                         UserCoupon userCoupon = userCouponService.lambdaQuery()
@@ -538,7 +514,7 @@ public class CouponLogic {
         List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         return userService.lambdaQuery()
-                .in(CollectionUtils.isNotEmpty(companyWechatIds), User::getCompanyWechatId, companyWechatIds)
+                .in(CollectionUtils.isNotEmpty(companyWechatIds), User::getCompanyId, companyWechatIds)
                 .eq(StringUtils.isNotEmpty(type), User::getType, type)
                 .ge(registerTime != null, User::getCreateTime, registerTime)
                 .like(StringUtils.isNotEmpty(tel), User::getMobile, tel.trim())
@@ -606,7 +582,7 @@ public class CouponLogic {
             if(StringUtils.isEmpty(couponName) || StringUtils.isEmpty(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).eq(User::getCompanyId,companyWechatId).one();
             if(user == null)
                 throw new RemoteServiceException("手机号为"+mobile+"的找不到对应用户");
 
@@ -626,8 +602,6 @@ public class CouponLogic {
             coupon.setFlag("WAIT");
             coupon.setRemark(mobile);
             coupon.setShareTimes(1);
-            coupon.setCompanyWechatId(companyWechatId);
-            coupon.setCompanyName(companyName);
             couponList.add(coupon);
 
             CouponUser couponUser = new CouponUser();
@@ -635,7 +609,6 @@ public class CouponLogic {
             couponUser.setUserId(user.getUserId());
             couponUser.setUserName(user.getNickName());
             couponUser.setCreateTime(new Date());
-            couponUser.setCompanyWechatId(companyWechatId);
             couponUser.setCompanyName(companyName);
             couponUserList.add(couponUser);
 
@@ -651,7 +624,6 @@ public class CouponLogic {
             userCoupon.setReceiveTime(new Date());
             userCoupon.setActiveStartTime(startTime);
             userCoupon.setActiveEndTime(endTime);
-            userCoupon.setCompanyWechatId(companyWechatId);
             userCoupon.setCompanyName(companyName);
             userCoupon.setTransferType(false);
             userCoupon.setLeftShareTimes(1);

src/main/java/com/gree/mall/manager/logic/goods/GoodsLogic.java

@@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.ExcelData;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
-import com.gree.mall.manager.bean.admin.AdminWebsitVO;
 import com.gree.mall.manager.bean.goods.*;
 import com.gree.mall.manager.commonmapper.CustomGoodsMapper;
 import com.gree.mall.manager.commonmapper.GoodsCheckMapper;
@@ -19,7 +18,6 @@ import com.gree.mall.manager.constant.Constant;
 import com.gree.mall.manager.enums.*;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
-import com.gree.mall.manager.logic.common.FucaiLogic;
 import com.gree.mall.manager.logic.user.UserLogic;
 import com.gree.mall.manager.plus.entity.*;
 import com.gree.mall.manager.plus.service.*;
@@ -52,8 +50,6 @@ import java.util.stream.Collectors;
 public class GoodsLogic {
     @Resource
     CommonLogic commonLogic;
-    @Autowired
-    FucaiLogic fucaiLogic;
 
     @Resource
     CustomGoodsMapper customGoodsMapper;
@@ -116,7 +112,7 @@ public class GoodsLogic {
 
         //获取当前登录微信企业微信id
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
+        List<String> companyIds = adminUser.getAdminCompanyIds();
 
         String sortStr = null;
         if (goodsSortJson != null && !goodsSortJson.trim().equals("")) {
@@ -133,7 +129,7 @@ public class GoodsLogic {
         }
 
         IPage<GoodsSpecBean> goodsSpecBeanIPage = customGoodsMapper.pageList(new Page<>(pageNum, pageSize), flag, keyword, startPrice,
-                endPrice, startShare, endShare, sortStr, categoryIds, status, goodsTypes,adminUser.getCompanyWechatId());
+                endPrice, startShare, endShare, sortStr, categoryIds, status, goodsTypes,adminUser.getCompanyId());
 
         //商品规格
         for (GoodsSpecBean goodsSpecBean : goodsSpecBeanIPage.getRecords()) {
@@ -167,7 +163,7 @@ public class GoodsLogic {
 
         //获取当前登录微信企业微信id
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
+        List<String> companyIds = adminUser.getAdminCompanyIds();
 
         String sortStr = null;
         if (goodsSortJson != null && !goodsSortJson.trim().equals("")) {
@@ -180,7 +176,7 @@ public class GoodsLogic {
         }
 
         IPage<GoodsPackageList> goodsPackageListIPage = customGoodsMapper.queryGoodsPackageList(new Page<>(pageNum, pageSize), keyword, startPrice,
-                endPrice, startShare, endShare, sortStr, categoryIds, status, companyWechatIds);
+                endPrice, startShare, endShare, sortStr, categoryIds, status, companyIds);
 
         return goodsPackageListIPage;
     }
@@ -196,11 +192,11 @@ public class GoodsLogic {
 
         //获取当前登录微信企业微信id
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
+        List<String> companyIds = adminUser.getAdminCompanyIds();
 
 
         IPage<GoodsSpecBean> goodsSpecBeanIPage = customGoodsMapper.pageList(new Page<>(1, -1), null, null, null,
-                null, null, null, null, categoryIds, null, null,adminUser.getCompanyWechatId());
+                null, null, null, null, categoryIds, null, null,adminUser.getCompanyId());
         //添加规格
         List<GoodsSpecBean> records = goodsSpecBeanIPage.getRecords();
         for (GoodsSpecBean record : records) {
@@ -445,7 +441,7 @@ public class GoodsLogic {
             String result = name.substring(0, name.length() - 1);
             goodsBean.setPutCompanyName(result);
             goodsBean.setCompanyName(result);
-            goodsBean.setCompanyWechatId(goodsBean.getPutCompanyId());
+            goodsBean.setCompanyId(goodsBean.getPutCompanyId());
         }
 
         GoodsCategory goodsCategory = goodsCategoryService.getById(goodsBean.getCategoryId());
@@ -459,7 +455,7 @@ public class GoodsLogic {
             goodsSpecList = goodsBean.getGoodsSpecs()
                     .stream()
                     .map(goodsSpec -> goodsSpec.setGoodsId(goodsBean.getGoodsId())
-                            .setCompanyWechatId(goodsBean.getCompanyWechatId())
+                            .setCompanyId(goodsBean.getCompanyId())
                             .setCompanyName(goodsBean.getCompanyName())
                             .setCreateTime(creatDate).setDel(false)
                             .setShareAmount(limitShareAmount(goodsSpec.getPrice(), goodsSpec.getShareAmount())) //限制金额40%
@@ -480,7 +476,7 @@ public class GoodsLogic {
             goodsTemplate.setGoodsId(goodsBean.getGoodsId());
             goodsTemplate.setTemplateId(goodsBean.getTemplateId());
             goodsTemplate.setCreateTime(new Date());
-            goodsTemplate.setCompanyWechatId(goodsBean.getCompanyWechatId());
+            goodsTemplate.setCompanyId(goodsBean.getCompanyId());
             goodsTemplate.setCompanyName(goodsBean.getCompanyName());
             goodsTemplateService.save(goodsTemplate);
         }
@@ -586,8 +582,8 @@ public class GoodsLogic {
         //设置企业微信id
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
 
-        goodsBean.setCompanyWechatId(adminUser.getLoginCompanyWechatId());
-        goodsBean.setCompanyName(adminUser.getLoginCompanyName());
+        goodsBean.setCompanyId(null);
+        goodsBean.setCompanyName(null);
 
         if (!StringUtil.isEmpty(goodsBean.getPutCompanyId())) {
             goodsBean.setPutCompanyId(goodsBean.getPutCompanyId());
@@ -601,18 +597,16 @@ public class GoodsLogic {
             String result = name.substring(0, name.length() - 1);
             goodsBean.setPutCompanyName(result);
             goodsBean.setCompanyName(result);
-            goodsBean.setCompanyWechatId(goodsBean.getPutCompanyId());
+            goodsBean.setCompanyId(goodsBean.getPutCompanyId());
         }
 
-        final AdminCompanyWechat companyWechat = adminCompanyWechatService.getById(adminUser.getLoginCompanyWechatId());
-
         List<GoodsSpec> notRemoveList = new ArrayList<>();
         //查找未删除的规格
         if(CollectionUtils.isNotEmpty(goodsBean.getGoodsSpecs())) {
             notRemoveList = goodsBean.getGoodsSpecs().stream()
                     .filter(goodsSpec -> StringUtils.isNotEmpty(goodsSpec.getGoodsSpecId()))
                     .map(goodsSpec -> goodsSpec.setGoodsId(goodsBean.getGoodsId())
-                            .setCompanyWechatId(goodsBean.getCompanyWechatId())
+                            .setCompanyId(goodsBean.getCompanyId())
                             .setCompanyName(goodsBean.getCompanyName())
                             .setShareAmount(limitShareAmount(goodsSpec.getPrice(), goodsSpec.getShareAmount()))  //限制金额40%
                             .setShareAmount(limitShareAmount(goodsSpec.getPrice(),      //比列>0 覆盖分销金额
@@ -641,7 +635,7 @@ public class GoodsLogic {
             goodsTemplate.setGoodsId(goodsBean.getGoodsId());
             goodsTemplate.setTemplateId(goodsBean.getTemplateId());
             goodsTemplate.setCreateTime(new Date());
-            goodsTemplate.setCompanyWechatId(goodsBean.getCompanyWechatId());
+            goodsTemplate.setCompanyId(goodsBean.getCompanyId());
             goodsTemplate.setCompanyName(goodsBean.getCompanyName());
             goodsTemplateService.save(goodsTemplate);
         }
@@ -671,7 +665,7 @@ public class GoodsLogic {
             List<GoodsSpec> addGoodsSpecList = goodsBean.getGoodsSpecs().stream()
                     .filter(goodsSpec -> StringUtils.isEmpty(goodsSpec.getGoodsSpecId()))
                     .map(goodsSpec -> goodsSpec.setGoodsId(goodsBean.getGoodsId())
-                            .setCompanyWechatId(goodsBean.getCompanyWechatId())
+                            .setCompanyId(goodsBean.getCompanyId())
                             .setCompanyName(goodsBean.getCompanyName())
                             .setShareAmount(limitShareAmount(goodsSpec.getPrice(), goodsSpec.getSharePercent() != null
                                     && goodsSpec.getSharePercent().compareTo(new Double("0.00")) > 0 ?
@@ -818,8 +812,8 @@ public class GoodsLogic {
             goodsTemplate.setGoodsId(goodsId);
             goodsTemplate.setTemplateId(goodsTemplateBean.getTemplateId());
             goodsTemplate.setCreateTime(new Date());
-            goodsTemplate.setCompanyWechatId(adminUser.getLoginCompanyWechatId());
-            goodsTemplate.setCompanyName(adminUser.getLoginCompanyName());
+            goodsTemplate.setCompanyId(null);
+            goodsTemplate.setCompanyName(null);
             goodsTemplateList.add(goodsTemplate);
         }
         goodsTemplateService.saveBatch(goodsTemplateList);
@@ -907,12 +901,8 @@ public class GoodsLogic {
      * 用 商品规格的 分销金额 覆盖其 为null的 内部分销金额
      */
     public void syncGoodsSpecInnerShareMsg(HttpServletRequest request){
-        String companyWechatId = commonLogic.getAdminUser(request).getLoginCompanyWechatId();
-        if(StringUtils.isEmpty(companyWechatId)){
-            throw new RemoteServiceException("运营账号暂无权限操作");
-        }
 
-        customGoodsMapper.syncGoodsSpecInnerShareMsg(companyWechatId);
+        customGoodsMapper.syncGoodsSpecInnerShareMsg(null);
 
     }
 
@@ -980,10 +970,10 @@ public class GoodsLogic {
      */
     public List<GoodsBean> outsideList(Date time){
 
-        List<GoodsCategory> goodsCategoryList = goodsCategoryService.lambdaQuery().eq(GoodsCategory::getCompanyWechatId, "1").list();
+        List<GoodsCategory> goodsCategoryList = goodsCategoryService.lambdaQuery().eq(GoodsCategory::getCompanyId, "1").list();
         Map<String, GoodsCategory> map = goodsCategoryList.stream().collect(Collectors.toMap(GoodsCategory::getCategoryId, Function.identity()));
 
-        List<Goods> list = goodsService.lambdaQuery().ge(time != null, Goods::getUpdateTime, time).eq(Goods::getCompanyWechatId,"1").list();
+        List<Goods> list = goodsService.lambdaQuery().ge(time != null, Goods::getUpdateTime, time).eq(Goods::getCompanyId,"1").list();
         List<GoodsBean> goodsBeans = BeanUtil.copyToList(list, GoodsBean.class);
         for(GoodsBean goodsBean : goodsBeans){
             List<GoodsSpec> list1 = goodsSpecService.lambdaQuery().eq(GoodsSpec::getGoodsId, goodsBean.getGoodsId()).list();
@@ -1010,13 +1000,13 @@ public class GoodsLogic {
 
     public void categoryAndGoods(String sourceCompanyId, String targetCompanyId, String targetCompanyName) {
         final Integer count = goodsCategoryService.lambdaQuery()
-                .eq(GoodsCategory::getCompanyWechatId, targetCompanyId)
+                .eq(GoodsCategory::getCompanyId, targetCompanyId)
                 .count();
         if (count > 0) {
             throw new RemoteServiceException("数据已存在");
         }
         List<GoodsCategory> parentCategoryList = goodsCategoryService.lambdaQuery()
-                .eq(GoodsCategory::getCompanyWechatId, sourceCompanyId)
+                .eq(GoodsCategory::getCompanyId, sourceCompanyId)
                 .eq(GoodsCategory::getLevel, 1)
                 .eq(GoodsCategory::getStatus, true)
                 .list();
@@ -1027,14 +1017,14 @@ public class GoodsLogic {
             // 插入目前父类
             BeanUtils.copyProperties(parentCategory, copyParentCategory);
             copyParentCategory.setCategoryId(IdWorker.getIdStr())
-                    .setCompanyWechatId(targetCompanyId)
+                    .setCompanyId(targetCompanyId)
                     .setCompanyName(targetCompanyName)
                     .setCreateTime(DateUtil.date())
                     .insert();
 
             // 查询源小类
             List<GoodsCategory> categoryList = goodsCategoryService.lambdaQuery()
-                    .eq(GoodsCategory::getCompanyWechatId, sourceCompanyId)
+                    .eq(GoodsCategory::getCompanyId, sourceCompanyId)
                     .eq(GoodsCategory::getParentId, parentCategory.getCategoryId())
                     .eq(GoodsCategory::getLevel, 2)
                     .eq(GoodsCategory::getStatus, true)
@@ -1046,7 +1036,7 @@ public class GoodsLogic {
                 // 插入目前小类
                 BeanUtils.copyProperties(goodsCategory, copyCategory);
                 copyCategory.setCategoryId(IdWorker.getIdStr())
-                        .setCompanyWechatId(targetCompanyId)
+                        .setCompanyId(targetCompanyId)
                         .setCompanyName(targetCompanyName)
                         .setParentId(copyParentCategory.getCategoryId())
                         .setCreateTime(DateUtil.date())
@@ -1055,7 +1045,7 @@ public class GoodsLogic {
                 // 查询源小类关联商品
                 final List<Goods> goodsList = goodsService.lambdaQuery()
                         .eq(Goods::getCategoryId, goodsCategory.getCategoryId())
-                        .eq(Goods::getCompanyWechatId, sourceCompanyId)
+                        .eq(Goods::getCompanyId, sourceCompanyId)
                         .eq(Goods::getStatus, true)
                         .list();
 
@@ -1065,7 +1055,7 @@ public class GoodsLogic {
                     // 插入目前商品
                     BeanUtils.copyProperties(goods, copyGoods);
                     copyGoods.setGoodsId(IdWorker.getIdStr())
-                            .setCompanyWechatId(targetCompanyId)
+                            .setCompanyId(targetCompanyId)
                             .setCompanyName(targetCompanyName)
                             .setCategoryId(copyCategory.getCategoryId())
                             .setSoldNum(0)
@@ -1076,7 +1066,7 @@ public class GoodsLogic {
                     // 查询源商品关联规格
                     final List<GoodsSpec> goodsSpecList = goodsSpecService.lambdaQuery()
                             .eq(GoodsSpec::getGoodsId, goods.getGoodsId())
-                            .eq(GoodsSpec::getCompanyWechatId, sourceCompanyId)
+                            .eq(GoodsSpec::getCompanyId, sourceCompanyId)
                             .list();
 
                     // 遍历源规格
@@ -1086,7 +1076,7 @@ public class GoodsLogic {
                         BeanUtils.copyProperties(goodsSpec, copyGoodsSpec);
                         copyGoodsSpec.setGoodsSpecId(IdWorker.getIdStr())
                                 .setGoodsId(copyGoods.getGoodsId())
-                                .setCompanyWechatId(targetCompanyId)
+                                .setCompanyId(targetCompanyId)
                                 .setCompanyName(targetCompanyName)
                                 .setShareAmount(BigDecimal.ZERO)
                                 .setSharePercent((double) 0)
@@ -1103,7 +1093,7 @@ public class GoodsLogic {
                     // 查询源商品关联说明模板
 //                    final List<GoodsTemplate> goodsTemplateList = goodsTemplateService.lambdaQuery()
 //                            .eq(GoodsTemplate::getGoodsId, goods.getGoodsId())
-//                            .eq(GoodsTemplate::getCompanyWechatId, sourceCompanyId)
+//                            .eq(GoodsTemplate::getCompanyId, sourceCompanyId)
 //                            .list();
 //
 //                    // 遍历源关联说明模板
@@ -1113,7 +1103,7 @@ public class GoodsLogic {
 //                        BeanUtils.copyProperties(goodsTemplate, copyGoodsTemplate);
 //                        copyGoodsTemplate.setGoodsTemplateId(IdWorker.getIdStr())
 //                                .setGoodsId(copyGoods.getGoodsId())
-//                                .setCompanyWechatId(targetCompanyId)
+//                                .setCompanyId(targetCompanyId)
 //                                .setCompanyName(targetCompanyName)
 //                                .setCreateTime(DateUtil.date())
 //                                .insert();
@@ -1144,13 +1134,13 @@ public class GoodsLogic {
 
     public void copyFreightTemplate(String sourceCompanyId, String targetCompanyId, String targetCompanyName) {
         final Integer count = freightTemplateService.lambdaQuery()
-                .eq(FreightTemplate::getCompanyWechatId, targetCompanyId)
+                .eq(FreightTemplate::getCompanyId, targetCompanyId)
                 .count();
         if (count > 0) {
             throw new RemoteServiceException("数据已存在");
         }
         List<FreightTemplate> freightTemplateList = freightTemplateService.lambdaQuery()
-                .eq(FreightTemplate::getCompanyWechatId, sourceCompanyId)
+                .eq(FreightTemplate::getCompanyId, sourceCompanyId)
                 .list();
 
         // 遍历源模板
@@ -1159,21 +1149,21 @@ public class GoodsLogic {
             // 插入目前模板
             BeanUtils.copyProperties(freightTemplate, copyFreightTemplate);
             copyFreightTemplate.setFreightTemplateId(IdWorker.getIdStr())
-                    .setCompanyWechatId(targetCompanyId)
+                    .setCompanyId(targetCompanyId)
                     .setCompanyName(targetCompanyName)
                     .setCreateTime(DateUtil.date())
                     .insert();
 
             // 查询源模板关联
             List<FreightTemplateDetail> freightTemplateDetailList = freightTemplateDetailService.lambdaQuery()
-                    .eq(FreightTemplateDetail::getCompanyWechatId, sourceCompanyId)
+                    .eq(FreightTemplateDetail::getCompanyId, sourceCompanyId)
                     .eq(FreightTemplateDetail::getFreightTemplateId, freightTemplate.getFreightTemplateId())
                     .list();
 
             goodsService.lambdaUpdate()
                     .set(Goods::getFreightTemplateId, copyFreightTemplate.getFreightTemplateId())
                     .eq(Goods::getFreightTemplateId, freightTemplate.getFreightTemplateId())
-                    .eq(Goods::getCompanyWechatId, targetCompanyId)
+                    .eq(Goods::getCompanyId, targetCompanyId)
                     .update();
 
             // 遍历源模板关联
@@ -1182,7 +1172,7 @@ public class GoodsLogic {
                 // 插入目前模板关联
                 BeanUtils.copyProperties(detail, copyDetail);
                 copyDetail.setFreightTemplateDetailId(IdWorker.getIdStr())
-                        .setCompanyWechatId(targetCompanyId)
+                        .setCompanyId(targetCompanyId)
                         .setCompanyName(targetCompanyName)
                         .setFreightTemplateId(copyFreightTemplate.getFreightTemplateId())
                         .setCreateTime(DateUtil.date())

src/main/java/com/gree/mall/manager/logic/goods/GoodsNewsCategoryLogic.java

@@ -49,7 +49,7 @@ public class GoodsNewsCategoryLogic {
         List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         return goodsNewsCategoryService.lambdaQuery()
-                .in(CollectionUtils.isNotEmpty(companyWechatIds), GoodsNewsCategory::getCompanyWechatId, companyWechatIds)
+                .in(CollectionUtils.isNotEmpty(companyWechatIds), GoodsNewsCategory::getCompanyId, companyWechatIds)
                 .orderByAsc(GoodsNewsCategory::getSortNum)
                 .page(new Page<>(pageNum, pageSize));
     }
@@ -60,13 +60,9 @@ public class GoodsNewsCategoryLogic {
     public GoodsNewsCategory addGoodsNewsCategory(HttpServletRequest request, String mainTitle, String subTitle,Integer type,Integer sortNum) {
 
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        String loginCompanyWechatId = adminUser.getLoginCompanyWechatId();
-        if (StringUtils.isEmpty(loginCompanyWechatId)) {
-            throw new RemoteServiceException("无添加新维度分类权限");
-        }
+
         if (goodsNewsCategoryService.lambdaQuery()
                 .eq(sortNum !=null,GoodsNewsCategory::getSortNum,sortNum)
-                .eq(GoodsNewsCategory::getCompanyWechatId, loginCompanyWechatId)
                 .count() > 0)
             throw new RemoteServiceException("排序重复，请修改");
 
@@ -75,8 +71,6 @@ public class GoodsNewsCategoryLogic {
         goodsNewsCategory.setSubTitle(subTitle);
         goodsNewsCategory.setType(type);
         goodsNewsCategory.setCreateBy(adminUser.getAdminUserId());
-        goodsNewsCategory.setCompanyWechatId(loginCompanyWechatId);
-        goodsNewsCategory.setCompanyName(adminUser.getLoginCompanyName());
         goodsNewsCategory.setSortNum(sortNum);
         goodsNewsCategory.insert();
 
@@ -91,17 +85,13 @@ public class GoodsNewsCategoryLogic {
     @Transactional(rollbackFor = Exception.class)
     public void vimGoodsNewsCategory(HttpServletRequest request, GoodsNewsCategoryVimBean reqDto) {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        String loginCompanyWechatId = adminUser.getLoginCompanyWechatId();
-        if (StringUtils.isEmpty(loginCompanyWechatId)) {
-            throw new RemoteServiceException("无编辑新维度分类权限");
-        }
+
         String goodsNewsCategoryId = reqDto.getGoodsNewsCategoryId();
         if (StringUtils.isEmpty(goodsNewsCategoryId)) {
             throw new RemoteServiceException("无效新维度分类");
         }
         if (reqDto.getSortNum()!= null && goodsNewsCategoryService.lambdaQuery()
                 .eq(reqDto.getSortNum() !=null,GoodsNewsCategory::getSortNum,reqDto.getSortNum())
-                .eq(GoodsNewsCategory::getCompanyWechatId, loginCompanyWechatId)
                 .ne(GoodsNewsCategory::getGoodsNewsCategoryId,reqDto.getGoodsNewsCategoryId())
                 .count() > 0)
             throw new RemoteServiceException("排序重复，请修改");
@@ -122,15 +112,12 @@ public class GoodsNewsCategoryLogic {
      */
     public void addActiveGoods(HttpServletRequest request, ActiveGoodsAddReqBean activeGoodsAddReqBean) {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        String loginCompanyWechatId = adminUser.getLoginCompanyWechatId();
-        if (StringUtils.isEmpty(loginCompanyWechatId)) {
-            throw new RemoteServiceException("无编辑权限");
-        }
+
         //初始化活动商品
-        initGoodsNewsCategory(activeGoodsAddReqBean.getObjectId(), loginCompanyWechatId, activeGoodsAddReqBean.getType());
+        initGoodsNewsCategory(activeGoodsAddReqBean.getObjectId(), null, activeGoodsAddReqBean.getType());
 
         //添加活动商品
-        addNewsCategoryGoods(activeGoodsAddReqBean.getObjectId(), loginCompanyWechatId, adminUser.getCompanyName(),
+        addNewsCategoryGoods(activeGoodsAddReqBean.getObjectId(), null, adminUser.getCompanyName(),
                 activeGoodsAddReqBean.getType(), activeGoodsAddReqBean.getGoodsList()
                );
     }
@@ -155,7 +142,6 @@ public class GoodsNewsCategoryLogic {
             goodsNewsCategoryGoods.setType(type);
             goodsNewsCategoryGoods.setGoodsId(goods.getGoodsId());
             goodsNewsCategoryGoods.setGoodsName(goods.getGoodsName());
-            goodsNewsCategoryGoods.setCompanyWechatId(companyWechatId);
             goodsNewsCategoryGoods.setCompanyName(companyName);
             goodsNewsCategoryGoods.setCreateTime(new Date());
 
@@ -171,7 +157,6 @@ public class GoodsNewsCategoryLogic {
 
         List<GoodsNewsCategoryGoods> list = goodsNewsCategoryGoodsService.lambdaQuery()
                 .select(GoodsNewsCategoryGoods::getGoodsNewsCategoryGoodsId)
-                .eq(GoodsNewsCategoryGoods::getCompanyWechatId, companyWechatId)
                 .eq(GoodsNewsCategoryGoods::getObjId, objecId)
                 .eq(GoodsNewsCategoryGoods::getType, type)
                 .list();
@@ -244,14 +229,10 @@ public class GoodsNewsCategoryLogic {
     @Transactional(rollbackFor = Exception.class)
     public void editStatus(String goodsNewsCategoryId, Boolean status, HttpServletRequest request) {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        String loginCompanyWechatId = adminUser.getLoginCompanyWechatId();
         GoodsNewsCategoryVimBean goodsNewsCategoryVimBean = new GoodsNewsCategoryVimBean();
         goodsNewsCategoryVimBean.setGoodsNewsCategoryId(goodsNewsCategoryId);
         goodsNewsCategoryVimBean.setStatus(status);
 
-        if (StringUtils.isEmpty(loginCompanyWechatId)) {
-            throw new RemoteServiceException("无编辑新维度分类权限");
-        }
         if (StringUtils.isEmpty(goodsNewsCategoryId)) {
             throw new RemoteServiceException("无效新维度分类");
         }
@@ -263,15 +244,12 @@ public class GoodsNewsCategoryLogic {
     @Transactional(rollbackFor = Exception.class)
     public void delete(String goodsNewsCategoryId, HttpServletRequest request) {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        String loginCompanyWechatId = adminUser.getLoginCompanyWechatId();
-        if (StringUtils.isEmpty(loginCompanyWechatId)) {
-            throw new RemoteServiceException("无编辑新维度分类权限");
-        }
+
         if (StringUtils.isEmpty(goodsNewsCategoryId)) {
             throw new RemoteServiceException("无效新维度分类");
         }
         //清除原先所有关系
-        initGoodsNewsCategory(goodsNewsCategoryId, loginCompanyWechatId, GoodsNewsCategoryGoodsTypeEnum.news.getCode());
+        initGoodsNewsCategory(goodsNewsCategoryId, null, GoodsNewsCategoryGoodsTypeEnum.news.getCode());
 
         GoodsNewsCategoryVimBean goodsNewsCategoryVimBean = new GoodsNewsCategoryVimBean();
         goodsNewsCategoryVimBean.setGoodsNewsCategoryId(goodsNewsCategoryId);

src/main/java/com/gree/mall/manager/logic/marketing/DynamicMaterialsLogic.java

@@ -1,133 +0,0 @@
-package com.gree.mall.manager.logic.marketing;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gree.mall.manager.bean.admin.AdminUserCom;
-import com.gree.mall.manager.bean.marketing.DynamicMaterialsDetailsBean;
-import com.gree.mall.manager.bean.marketing.DynamicMaterialsPageBean;
-import com.gree.mall.manager.bean.marketing.DynamicMaterialsVisitStatisticsBean;
-import com.gree.mall.manager.commonmapper.MarketingMaterialsVisitCustomMapper;
-import com.gree.mall.manager.enums.MarketingMaterialsTypeEnum;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.logic.common.CommonLogic;
-import com.gree.mall.manager.plus.entity.MarketingMaterials;
-import com.gree.mall.manager.plus.entity.MarketingMaterialsVisit;
-import com.gree.mall.manager.plus.entity.Tag;
-import com.gree.mall.manager.plus.service.MarketingMaterialsService;
-import com.gree.mall.manager.plus.service.MarketingMaterialsVisitService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.servlet.http.HttpServletRequest;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 动态素材
- */
-@Service
-@Slf4j
-public class DynamicMaterialsLogic {
-
-    @Autowired
-    private CommonLogic commonLogic;
-    @Autowired
-    private MarketingMaterialsService marketingMaterialsService;
-    @Autowired
-    private MarketingMaterialsVisitCustomMapper marketingMaterialsVisitCustomMapper;
-    @Autowired
-    private MarketingMaterialsVisitService marketingMaterialsVisitService;
-
-    /**
-     * 分页查询动态素材
-     */
-    public IPage<DynamicMaterialsPageBean> page(HttpServletRequest request, String name, Integer pageNum, Integer pageSize) {
-
-        AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
-
-        IPage<MarketingMaterials> page = marketingMaterialsService.lambdaQuery()
-                .like(StringUtils.isNotEmpty(name), MarketingMaterials::getTitle, name)
-                .eq(MarketingMaterials::getDynamic, true)
-                .eq(MarketingMaterials::getType, MarketingMaterialsTypeEnum.WEB.getCode())  //限制为网页
-                .in(CollectionUtils.isNotEmpty(companyWechatIds), MarketingMaterials::getCompanyWechatId, companyWechatIds)
-                .orderByDesc(MarketingMaterials::getCreateTime)
-                .page(new Page<>(pageNum, pageSize));
-
-        List<DynamicMaterialsPageBean> respList = new ArrayList<>();
-        for (MarketingMaterials marketingMaterials : page.getRecords()
-        ) {
-            DynamicMaterialsPageBean respBean = new DynamicMaterialsPageBean();
-            BeanUtils.copyProperties(marketingMaterials, respBean);
-            respList.add(respBean);
-
-            List<Tag> materialsTag = marketingMaterialsVisitCustomMapper.getMaterialsTag(respBean.getMarketingMaterialsId());
-            respBean.setTags(materialsTag);
-        }
-
-        Page<DynamicMaterialsPageBean> respPage = new Page<>();
-        BeanUtils.copyProperties(page, respPage);
-        respPage.setRecords(respList);
-        return respPage;
-    }
-
-
-    /**
-     * 动态素材详情
-     */
-    public DynamicMaterialsDetailsBean details(HttpServletRequest request, String materialsId, String name, String beginTime, String endTime) {
-        MarketingMaterials marketingMaterials = marketingMaterialsService.lambdaQuery()
-                .eq(MarketingMaterials::getMarketingMaterialsId, materialsId)
-                .eq(MarketingMaterials::getDynamic, true)
-                .one();
-        if (marketingMaterials == null) {
-            throw new RemoteServiceException("未找到该动态素材");
-        }
-
-        DynamicMaterialsDetailsBean respBean = new DynamicMaterialsDetailsBean();
-        BeanUtils.copyProperties(marketingMaterials, respBean);
-
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        Date now = new Date();
-        String nowStart = simpleDateFormat.format(now) + " 00:00:00";
-        String nowEnd = simpleDateFormat.format(now) + " 23:59:59";
-
-        //点击数
-        Integer totalCount = marketingMaterialsVisitService.lambdaQuery()
-                .eq(MarketingMaterialsVisit::getMarketingMaterialsId, materialsId)
-                .count();
-        Integer todayCount = marketingMaterialsVisitService.lambdaQuery()
-                .eq(MarketingMaterialsVisit::getMarketingMaterialsId, materialsId)
-                .between(MarketingMaterialsVisit::getCreateTime, nowStart, nowEnd)
-                .count();
-        respBean.setTotalCount(totalCount);
-        respBean.setTodayCount(todayCount);
-
-        //点击人数
-        Integer totalUserCount = marketingMaterialsVisitService.lambdaQuery()
-                .eq(MarketingMaterialsVisit::getMarketingMaterialsId, materialsId)
-                .groupBy(MarketingMaterialsVisit::getUserId)
-                .count();
-        Integer todayUserCount = marketingMaterialsVisitService.lambdaQuery()
-                .eq(MarketingMaterialsVisit::getMarketingMaterialsId, materialsId)
-                .between(MarketingMaterialsVisit::getCreateTime, nowStart, nowEnd)
-                .groupBy(MarketingMaterialsVisit::getUserId)
-                .count();
-        respBean.setTotalUserCount(totalUserCount);
-        respBean.setTodayUserCount(todayUserCount);
-
-        //用户点击统计
-        List<DynamicMaterialsVisitStatisticsBean> visitList
-                = marketingMaterialsVisitCustomMapper.getDynamicMaterialsVisitStatistics(materialsId, name, beginTime, endTime);
-
-        respBean.setVisitList(visitList);
-        return respBean;
-    }
-
-}

src/main/java/com/gree/mall/manager/logic/marketing/MarketingMaterialsGroupLogic.java

@@ -1,121 +0,0 @@
-package com.gree.mall.manager.logic.marketing;
-
-
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.gree.mall.manager.bean.admin.AdminUserCom;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.logic.common.CommonLogic;
-import com.gree.mall.manager.plus.entity.MarketingMaterials;
-import com.gree.mall.manager.plus.entity.MarketingMaterialsGroup;
-import com.gree.mall.manager.plus.entity.MarketingMaterialsTag;
-import com.gree.mall.manager.plus.service.MarketingMaterialsGroupService;
-import com.gree.mall.manager.plus.service.MarketingMaterialsService;
-import com.gree.mall.manager.plus.service.MarketingMaterialsTagService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 营销素材分组
- */
-@Service
-public class MarketingMaterialsGroupLogic {
-
-    @Autowired
-    private MarketingMaterialsGroupService marketingMaterialsGroupService;
-    @Autowired
-    private MarketingMaterialsService marketingMaterialsService;
-    @Autowired
-    private MarketingMaterialsTagService marketingMaterialsTagService;
-    @Autowired
-    private CommonLogic commonLogic;
-
-
-    /**
-     * 获取分组
-     */
-    public List<MarketingMaterialsGroup> list(HttpServletRequest request, String groupName) {
-        AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
-
-        return marketingMaterialsGroupService.lambdaQuery()
-                .eq(StringUtils.isNotEmpty(groupName), MarketingMaterialsGroup::getGroupName, groupName)
-                .in(CollectionUtils.isNotEmpty(companyWechatIds), MarketingMaterialsGroup::getCompanyWechatId, companyWechatIds)
-                .orderByDesc(MarketingMaterialsGroup::getCreateTime)
-                .list();
-    }
-
-    /**
-     * 添加分组
-     */
-    public MarketingMaterialsGroup add(HttpServletRequest request, String groupName) {
-        AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        String loginCompanyWechatId = adminUser.getLoginCompanyWechatId();
-        if (StringUtils.isEmpty(loginCompanyWechatId)) {
-            throw new RemoteServiceException("运营账号暂无权限操作");
-        }
-
-        MarketingMaterialsGroup marketingMaterialsGroup = new MarketingMaterialsGroup();
-        marketingMaterialsGroup.setGroupName(groupName);
-        marketingMaterialsGroup.setCreateTime(new Date());
-        marketingMaterialsGroup.setCreateBy(adminUser.getAdminUserId());
-        marketingMaterialsGroup.setCompanyWechatId(loginCompanyWechatId);
-        marketingMaterialsGroup.setCompanyName(adminUser.getLoginCompanyName());
-
-        marketingMaterialsGroupService.save(marketingMaterialsGroup);
-        return marketingMaterialsGroup;
-
-    }
-
-    /**
-     * 修改分组
-     */
-    public void update(String groupId, String groupName) {
-
-        MarketingMaterialsGroup marketingMaterialsGroup = new MarketingMaterialsGroup();
-        marketingMaterialsGroup.setGroupName(groupName);
-        marketingMaterialsGroup.setMarketingGroupId(groupId);
-        marketingMaterialsGroupService.updateById(marketingMaterialsGroup);
-
-    }
-
-    /**
-     * 删除分组
-     */
-    @Transactional
-    public void delete(String groupId) {
-
-        //删除分组
-        marketingMaterialsGroupService.lambdaUpdate()
-                .eq(MarketingMaterialsGroup::getMarketingGroupId, groupId)
-                .remove();
-
-        //删除与素材绑定的tage
-        List<MarketingMaterials> list = marketingMaterialsService.lambdaQuery()
-                .select(MarketingMaterials::getMarketingMaterialsId)
-                .eq(MarketingMaterials::getMarketingGroupId, groupId)
-                .list();
-        List<String> getMarketingMaterialsIds = list.stream().map(MarketingMaterials::getMarketingMaterialsId).collect(Collectors.toList());
-
-        if(CollectionUtils.isNotEmpty(getMarketingMaterialsIds)){
-            marketingMaterialsTagService.lambdaUpdate()
-                    .in(MarketingMaterialsTag::getMarketingMaterialsId,getMarketingMaterialsIds)
-                    .remove();
-        }
-
-
-        //删除该分组底下的所有的营销素材
-        marketingMaterialsService.lambdaUpdate()
-                .eq(MarketingMaterials::getMarketingGroupId, groupId)
-                .remove();
-
-
-    }
-
-}

src/main/java/com/gree/mall/manager/logic/member/UserCouponLogic.java

@@ -37,7 +37,7 @@ public class UserCouponLogic {
         List<String> companyWechatIds = adminUser.getAdminCompanyIds();
 
         return userCouponService.lambdaQuery()
-                .in(CollectionUtils.isNotEmpty(companyWechatIds), UserCoupon::getCompanyWechatId , companyWechatIds)
+                .in(CollectionUtils.isNotEmpty(companyWechatIds), UserCoupon::getCompanyId , companyWechatIds)
                 .like(StringUtils.isNotBlank(couponName), UserCoupon::getCouponName, couponName)
                 .eq(StringUtils.isNotBlank(couponName), UserCoupon::getCouponType, couponType)
                 .page(new Page<>(pageNum, pageSize));

src/main/java/com/gree/mall/manager/logic/notice/MiniNoticeLogic.java

@@ -1,9 +1,7 @@
 package com.gree.mall.manager.logic.notice;
 
-import com.aliyuncs.utils.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
-import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.plus.entity.MiniNotice;
 import com.gree.mall.manager.plus.service.MiniNoticeService;
@@ -56,7 +54,7 @@ public class MiniNoticeLogic {
 
 
         List<MiniNotice> list = miniNoticeService.lambdaQuery()
-                .in(CollectionUtils.isNotEmpty(companyWechatIds),MiniNotice::getCompanyWechatId,companyWechatIds)
+                .in(CollectionUtils.isNotEmpty(companyWechatIds),MiniNotice::getCompanyId,companyWechatIds)
                 .list();
         return list;
     }

src/main/java/com/gree/mall/manager/logic/notice/NoticeLogic.java

@@ -1,13 +1,11 @@
 package com.gree.mall.manager.logic.notice;
 
-import com.aliyuncs.utils.StringUtils;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
-import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
-import com.gree.mall.manager.plus.entity.*;
+import com.gree.mall.manager.plus.entity.Notice;
 import com.gree.mall.manager.plus.service.GoodsSpecService;
 import com.gree.mall.manager.plus.service.NoticeService;
 import com.gree.mall.manager.plus.service.PromotionGroupSpecService;
@@ -16,7 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
 
 @Component
 public class NoticeLogic {
@@ -59,79 +58,6 @@ public class NoticeLogic {
             return oldValue;
         }
     }
-    /**
-     * 商品库存提醒
-     */
-    public void stockNotice(){
-        final int stockNum = 10;
-        //基础商品
-        List<GoodsSpec> list = goodsSpecService.lambdaQuery()
-                .le(GoodsSpec::getStockNum, stockNum)
-                .list();
-
-        Map<String,Node> goodsIdMap=new HashMap<>();
-        for (GoodsSpec goodsSpec:list
-             ) {
-            Node node = new Node( goodsSpec.getCompanyWechatId() , goodsSpec.getCompanyName() );
-            goodsIdMap.put( goodsSpec.getGoodsId() , node );
-        }
-        //新增基础商品通知
-        this.addNotice(goodsIdMap,2);
-
-
-        //秒杀商品
-        List<SecKillActivitySpec> list2 = secKillActivitySpecService.lambdaQuery()
-                .le(SecKillActivitySpec::getSecStockNum, stockNum)
-                .list();
-        goodsIdMap=new HashMap<>();
-        for (SecKillActivitySpec secKillActivitySpec:list2
-             ) {
-            Node node=new Node(secKillActivitySpec.getCompanyWechatId() , secKillActivitySpec.getCompanyName());
-            goodsIdMap.put(secKillActivitySpec.getGoodsId(),node);
-        }
-        //新增秒杀商品通知
-        this.addNotice(goodsIdMap,3);
-
-
-        //团购商品
-        List<PromotionGroupSpec> list3 = promotionGroupSpecService.lambdaQuery()
-                .le(PromotionGroupSpec::getStock, stockNum)
-                .list();
-        goodsIdMap=new HashMap<>();
-        for (PromotionGroupSpec promotionGroupSpec:list3
-             ) {
-            Node node=new Node(promotionGroupSpec.getCompanyWechatId() , promotionGroupSpec.getCompanyName());
-            goodsIdMap.put(promotionGroupSpec.getGoodsId(),node);
-        }
-        //新增团购商品通知
-        this.addNotice(goodsIdMap,4);
-
-    }
-
-    private void addNotice(Map<String,Node> goodsIdMap,Integer type){
-        if(goodsIdMap.size() == 0){
-            return;
-        }
-        Map<String,String> map = new HashMap<>();
-        map.put("2","基础商品");
-        map.put("3","秒杀商品");
-        map.put("4","团购商品");
-
-        List<Notice> notices = new ArrayList<>();
-        Date date = new Date();
-        for(String goodsId : goodsIdMap.keySet()) {
-            Notice notice = new Notice();
-            notice.setObjId(goodsId);
-            notice.setTitle("商品库存");
-            notice.setType(type);
-            notice.setContent(map.get(type.toString())+"id:"+goodsId+",商品库存不足10,请及时补充库存");
-            notice.setCreateTime(date);
-            notice.setCompanyWechatId(goodsIdMap.get(goodsId).getKey());
-            notice.setCompanyName(goodsIdMap.get(goodsId).getValue());
-            notices.add(notice);
-        }
-        noticeService.saveBatch(notices);
-    }
 
 
     public IPage<Notice> page(HttpServletRequest request,Boolean readFlag, Integer pageNum, Integer pageSize) {
@@ -147,7 +73,7 @@ public class NoticeLogic {
 
         return noticeService.lambdaQuery()
                // .in(!CollectionUtils.isEmpty(websitNoList),Notice::getWebsitNumber,websitNoList)
-                .in(CollectionUtils.isNotEmpty(companyWechatIds),Notice::getCompanyWechatId,companyWechatIds)
+                .in(CollectionUtils.isNotEmpty(companyWechatIds),Notice::getCompanyId,companyWechatIds)
                 .eq(readFlag!=null,Notice::getReadFlag,readFlag)
                 .orderByDesc(Notice::getCreateTime)
                 .page(new Page(pageNum, pageSize));
@@ -168,7 +94,7 @@ public class NoticeLogic {
 
         return noticeService.lambdaQuery()
                 //.in(!adminWebsitBean.getType(),Notice::getWebsitNumber,websitNoList)
-                .in(CollectionUtils.isNotEmpty(companyWechatIds) , Notice::getCompanyWechatId , companyWechatIds)
+                .in(CollectionUtils.isNotEmpty(companyWechatIds) , Notice::getCompanyId , companyWechatIds)
                 .eq(Notice::getReadFlag,false)
                 .count();
     }
@@ -184,20 +110,7 @@ public class NoticeLogic {
     }
 
     public void markReadAll(HttpServletRequest request) {
-        /*List<String> websitNoList = new ArrayList<>();
-        AdminWebsitBean adminWebsitBean = CommonUtils.getAdminUser(request);
-        if (!adminWebsitBean.getType()) {
-            websitNoList = adminWebsitBean.getWeidsitIds().stream().map(WebsitZone::getWebsitNumber).collect(Collectors.toList());
-        }*/
-        AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        String companyWechatId = adminUser.getLoginCompanyWechatId();
-        if(StringUtils.isEmpty(companyWechatId)){
-            throw new RemoteServiceException("无效微信企业id");
-        }
-
         noticeService.lambdaUpdate()
-                //.in(!adminWebsitBean.getType(),Notice::getWebsitNumber,websitNoList)
-                .eq(Notice::getCompanyWechatId , companyWechatId)
                 .eq(Notice::getReadFlag,false)
                 .set(Notice::getReadFlag,true)
                 .update();

src/main/java/com/gree/mall/manager/logic/order/CommentTagLogic.java

@@ -1,7 +1,6 @@
 package com.gree.mall.manager.logic.order;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.logic.common.CommonLogic;
@@ -54,7 +53,7 @@ public class CommentTagLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
         CommentTag commentTag = new CommentTag();
         commentTag.setTag(tag);
-        commentTag.setCompanyWechatId(adminUser.getLoginCompanyWechatId());
+        commentTag.setCompanyId(null);
         commentTag.setCreateTime(new Date());
         commentTag.insert();
     }

src/main/java/com/gree/mall/manager/logic/order/OrderLogic.java

@@ -15,7 +15,6 @@ import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.ExpressLogic;
 import com.gree.mall.manager.logic.StorageLogic;
 import com.gree.mall.manager.logic.common.CommonLogic;
-import com.gree.mall.manager.logic.common.GongdanLogic;
 import com.gree.mall.manager.logic.common.UMSLogic;
 import com.gree.mall.manager.logic.common.WechatLogic;
 import com.gree.mall.manager.logic.common.kuaidi100.response.SubscribePushParamResp;
@@ -63,8 +62,6 @@ public class OrderLogic {
     @Autowired
     WechatLogic wechatLogic;
     @Autowired
-    GongdanLogic gongdanLogic;
-    @Autowired
     RedisLockRegistry redisLockRegistry;
     @Autowired
     CommentTagLogic commentTagLogic;
@@ -132,7 +129,7 @@ public class OrderLogic {
         }
 
         IPage page = orderInfoService.lambdaQuery()
-                .in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()), OrderInfo::getCompanyWechatId, adminUser.getAdminCompanyIds())
+                .in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()), OrderInfo::getCompanyId, adminUser.getAdminCompanyIds())
                 .in(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()), OrderInfo::getWebsitId, adminUser.getAdminWebsitIds())
                 .eq(StringUtils.isNotEmpty(userId), OrderInfo::getUserId, userId)
                 .eq(StringUtils.isNotEmpty(goodsId), OrderInfo::getPromotionPackageGoodsId, goodsId)
@@ -580,7 +577,7 @@ public class OrderLogic {
     @Transactional
     public void deliverGoods(String orderId, String logisticsNo, String companyCode, String storageId, Boolean workOrder, Boolean exchange) throws Exception {
         OrderInfo orderInfo = orderInfoService.getById(orderId);
-        final AdminCompanyWechat companyWechat = adminCompanyWechatService.getById(orderInfo.getCompanyWechatId());
+        final AdminCompanyWechat companyWechat = adminCompanyWechatService.getById(orderInfo.getCompanyId());
         User user = userLogic.getById(orderInfo.getUserId());
         if (!orderInfo.getOrderStatus().equals(OrderStatusEnum.DFH.toString())) {
             throw new RemoteServiceException("非待发货订单不可发货");
@@ -649,10 +646,6 @@ public class OrderLogic {
     }
 
     private String preCheck(AdminUserCom adminUser, List<DeliverGoodsBean> deliverGoodsBeanList) {
-        String loginCompanyWechatId = adminUser.getLoginCompanyWechatId();
-        if (StringUtils.isEmpty(loginCompanyWechatId)) {
-            throw new RemoteServiceException("无效微信企业id");
-        }
 
         StringBuffer sb = new StringBuffer();
         int index = 0;
@@ -672,7 +665,7 @@ public class OrderLogic {
                 sb.append(String.format("第%d条数据订单号不正确或已发货,请检查\n", index));
             }
 
-            Storage detail = storageLogic.detailByName(loginCompanyWechatId, deliverGoodsBean.getWarehouse().trim());
+            Storage detail = storageLogic.detailByName(null, deliverGoodsBean.getWarehouse().trim());
             if (detail == null) {
                 sb.append(String.format("第%d条数据仓库出错,请检查\n", index));
             }
@@ -694,13 +687,13 @@ public class OrderLogic {
         if (org.apache.commons.lang3.StringUtils.isEmpty(orderId)) {
             throw new RemoteServiceException("订单号不能为空");
         }
-        final AdminCompanyWechat companyWechat = adminCompanyWechatService.getById(orderInfo.getCompanyWechatId());
+        final AdminCompanyWechat companyWechat = adminCompanyWechatService.getById(orderInfo.getCompanyId());
 
         if (orderInfo == null) {
             throw new RemoteServiceException(String.format("订单号:%s不正确或已发货,请检查", deliverGoodsBean.getOrderId()));
         }
 
-        Storage detail = storageLogic.detailByName(adminUserCom.getLoginCompanyWechatId(), deliverGoodsBean.getWarehouse().trim());
+        Storage detail = storageLogic.detailByName(null, deliverGoodsBean.getWarehouse().trim());
         if (detail == null) {
             throw new RemoteServiceException(String.format("订单号:%s仓库出错,请检查", deliverGoodsBean.getOrderId()));
         }
@@ -1037,46 +1030,6 @@ public class OrderLogic {
         }
     }
 
-    //生成工单到工单系统
-    public void orderToPhp(OrderInfo orderInfo, String workOrderTypeEnum) throws Exception {
-
-        if (orderInfo.getWorkOrder() == null || !orderInfo.getWorkOrder()) {
-            return;
-        }
-
-        //需要发货的安装单类型 //101=家用空调,103 = 热水器,104=生活电器,106=冰箱,115 = 厨大电
-        //冰箱和生活电器经业务沟通，不派单
-        List<String> mainNumbers = Arrays.asList("101", "103", "115");
-
-        //订单明细
-        List<OrderDetail> list = orderDetailService.lambdaQuery()
-                .eq(OrderDetail::getWorkOrderType, workOrderTypeEnum)
-                .eq(OrderDetail::getOrderId, orderInfo.getOrderId())
-                .list();
-
-        //非退换货的拆单推送
-        if (workOrderTypeEnum.equals(WorkOrderTypeEnum.INSTALL.toString())) {
-            //如果是退换货的单，直接全拆
-            if (orderInfo.getExchangeOrder() != null && orderInfo.getExchangeOrder()) {
-                for (OrderDetail orderDetail : list) {
-                    gongdanLogic.installOrder(orderInfo, Arrays.asList(orderDetail), orderDetail.getMainNumber());
-                }
-            } else {
-                //非退换货的单，按品类拆，里面还会按营销类型拆
-                for (String mainNumber : mainNumbers) {
-                    gongdanLogic.installOrder(orderInfo, list, mainNumber);
-                }
-            }
-        } else {
-            for (OrderDetail orderDetail : list) {
-                gongdanLogic.repairOrder(orderInfo, orderDetail);
-            }
-        }
-
-
-    }
-
-
     private String trimStr(String... str) {
         StringBuffer sb = new StringBuffer("");
         for (String s : str) {

src/main/java/com/gree/mall/manager/logic/order/OrderRefundLogic.java

@@ -8,13 +8,11 @@ import com.gree.mall.manager.bean.ExcelData;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.order.OrderDetailListBean;
 import com.gree.mall.manager.bean.order.OrderRefundDetailBean;
-import com.gree.mall.manager.bean.order.WorkerOrderInfo;
 import com.gree.mall.manager.commonmapper.OrderRefundInfoMapper;
 import com.gree.mall.manager.constant.Constant;
 import com.gree.mall.manager.enums.*;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
-import com.gree.mall.manager.logic.common.GongdanLogic;
 import com.gree.mall.manager.logic.common.UMSLogic;
 import com.gree.mall.manager.logic.common.WechatLogic;
 import com.gree.mall.manager.logic.coupon.CouponLogic;
@@ -53,8 +51,6 @@ public class OrderRefundLogic {
     @Autowired
     CommonLogic commonLogic;
     @Autowired
-    GongdanLogic gongdanLogic;
-    @Autowired
     CouponLogic couponLogic;
     @Autowired
     OrderInfoService orderInfoService;
@@ -83,7 +79,7 @@ public class OrderRefundLogic {
 
         IPage page = orderRefundService.lambdaQuery()
                 .like(StringUtils.isNotEmpty(orderId), OrderRefund::getOrderId, orderId)
-                .in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()), OrderRefund::getCompanyWechatId, adminUser.getAdminCompanyIds())
+                .in(CollectionUtils.isNotEmpty(adminUser.getAdminCompanyIds()), OrderRefund::getCompanyId, adminUser.getAdminCompanyIds())
                 .in(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()), OrderRefund::getWebsitId, adminUser.getAdminWebsitIds())
                 .like(StringUtils.isNotEmpty(orderRefundId), OrderRefund::getOrderRefundId, orderRefundId)
                 .like(StringUtils.isNotEmpty(userName), OrderRefund::getUserName, userName)
@@ -174,23 +170,6 @@ public class OrderRefundLogic {
                 throw new RemoteServiceException("退款失败,订单已结算");
             }
 
-            //检查工单状态是否为 报完工或者正常关闭
-            List<WorkerOrderInfo> installOrderList = gongdanLogic.getInstallOrderList(orderInfo.getOrderId());
-            List<WorkerOrderInfo> repairOrderList = gongdanLogic.getRepairOrderList(orderInfo.getOrderId());
-            if (installOrderList.size() > 0) {
-                long count = installOrderList.stream().filter(v -> v.getOrderStateInt() == 7 || v.getOrderStateInt() == 10).count();
-                if (count > 0) {
-                    throw new RemoteServiceException("退款失败,工单已报完工");
-                }
-            }
-            if (repairOrderList.size() > 0) {
-                long count = repairOrderList.stream().filter(v -> v.getOrderStateInt() == 8 && v.getOrderStateInt() == 9 && v.getOrderStateInt() == 10
-                        && v.getOrderStateInt() == 11 && v.getOrderStateInt() == 14).count();
-                if (count > 0) {
-                    throw new RemoteServiceException("退款失败,工单已报完工");
-                }
-            }
-
             if (orderRefund.getRefundType().equals(OrderRefundTypeEnum.REFUND_AMOUNT.toString())) {
                 //直接退钱，并直接已完成售后订单
                 orderStatus = OrderStatusEnum.OVER.toString();

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

@@ -10,7 +10,6 @@ import com.gree.mall.manager.bean.ExcelData;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.order.OrderShareReportBean;
 import com.gree.mall.manager.commonmapper.OrderShareReportMapper;
-import com.gree.mall.manager.constant.Constant;
 import com.gree.mall.manager.enums.*;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
@@ -308,7 +307,7 @@ public class OrderShareLogic {
      * 师傅本月的结算数
      */
     public Integer getShareNum(String mobile){
-        User user = userService.lambdaQuery().eq(User::getWorkPhone, mobile).eq(User::getCompanyWechatId,Constant.GD_COMPANY_WECHAT_ID).last("limit 1").one();
+        User user = userService.lambdaQuery().eq(User::getWorkPhone, mobile).last("limit 1").one();
         if(user == null){
             return 0;
         }
@@ -341,7 +340,7 @@ public class OrderShareLogic {
             throw new RemoteServiceException("不存在未结算的信息");
         }
         try {
-            if(StringUtils.isEmpty(orderInfo.getCompanyWechatId())){
+            if(StringUtils.isEmpty(orderInfo.getCompanyId())){
                 return;
             }
             //查询是否存在未处理完成的售后单
@@ -351,7 +350,7 @@ public class OrderShareLogic {
             if(count > 0){
                 throw new RemoteServiceException("订单"+orderId+"存在未完结的维权订单");
             }
-            wechatLogic.shareAmount(orderId, orderInfo.getTransactionId(), list, orderInfo.getCompanyWechatId());
+            wechatLogic.shareAmount(orderId, orderInfo.getTransactionId(), list, orderInfo.getCompanyId());
             this.updateOrderShare(orderId, OrderShareStatusEnum.OVER.toString());
 
         } catch (WxPayException e) {
@@ -364,11 +363,11 @@ public class OrderShareLogic {
 
     public Boolean confirmAuto(List<OrderShare> orderShares, OrderInfo orderInfo) {
         try {
-            if (StringUtils.isEmpty(orderInfo.getCompanyWechatId())) {
+            if (StringUtils.isEmpty(orderInfo.getCompanyId())) {
                 return false;
             }
 
-            wechatLogic.shareAmount(orderInfo.getOrderId(), orderInfo.getTransactionId(), orderShares, orderInfo.getCompanyWechatId());
+            wechatLogic.shareAmount(orderInfo.getOrderId(), orderInfo.getTransactionId(), orderShares, orderInfo.getCompanyId());
             this.updateOrderShare(orderInfo.getOrderId(), OrderShareStatusEnum.OVER.toString());
             return true;
         } catch (WxPayException e) {

src/main/java/com/gree/mall/manager/logic/report/OfflineDataLogic.java

@@ -1,135 +0,0 @@
-package com.gree.mall.manager.logic.report;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gree.mall.manager.bean.ExcelData;
-import com.gree.mall.manager.bean.admin.AdminUserCom;
-import com.gree.mall.manager.enums.OfflineSaleRecordSaleTypeEnum;
-import com.gree.mall.manager.logic.common.CommonLogic;
-import com.gree.mall.manager.plus.entity.AdminWebsit;
-import com.gree.mall.manager.plus.entity.OfflineSaleRecord;
-import com.gree.mall.manager.plus.service.AdminWebsitService;
-import com.gree.mall.manager.plus.service.OfflineSaleRecordService;
-import com.gree.mall.manager.utils.DateUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Service
-@Slf4j
-public class OfflineDataLogic {
-
-    @Autowired
-    private AdminWebsitService adminWebsitService;
-    @Autowired
-    private OfflineSaleRecordService offlineSaleRecordService;
-    @Autowired
-    private CommonLogic commonLogic;
-
-    public IPage<OfflineSaleRecord> page(HttpServletRequest request,String name, String phone, String websitName, String websitNumber,
-                                         String category, Integer num, BigDecimal minAmount, BigDecimal maxAmount, Boolean status,
-                                         String startTime, String endTime, Integer pageNum, Integer pageSize
-    ) {
-        /*AdminWebsitBean adminWebsitBean = CommonUtils.getAdminUser(request);
-        List<String> zoneIds = new ArrayList<>();
-        if(adminWebsitBean.getType() == 0){
-            List<AdminUserZone> adminWebsitBeanList = adminUserZoneService.lambdaQuery().eq(AdminUserZone::getAdminUserId,adminWebsitBean.getAdminUserId()).list();
-            if(CollectionUtils.isNotEmpty(adminWebsitBeanList)){
-                zoneIds = adminWebsitBeanList.stream().map(AdminUserZone::getAdminZoneId).collect(Collectors.toList());
-            }
-        }
-*/
-        AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
-        List<AdminWebsit> list = adminWebsitService.lambdaQuery()
-                //.//in(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()), AdminWebsit::getWebsitId, adminUser.getAdminWebsitIds())
-//                .in(AdminWebsit::getCorpId, adminUser.getCorpIds())
-                .list();
-        List<String> websitNumbers = list.stream().map(AdminWebsit::getWebsitNumber).collect(Collectors.toList());
-
-        IPage page = offlineSaleRecordService.lambdaQuery()
-                .eq(status != null, OfflineSaleRecord::getStatus, status)
-                .in(CollectionUtils.isNotEmpty(websitNumbers),OfflineSaleRecord::getWebsitNumber,websitNumbers)
-                .in(CollectionUtils.isNotEmpty(companyWechatIds), OfflineSaleRecord::getCompanyWechatId, companyWechatIds)
-                .eq(num != null, OfflineSaleRecord::getSaleNum, num)
-                .like(StringUtils.isNotEmpty(name), OfflineSaleRecord::getSaleManName, name)
-                .like(StringUtils.isNotEmpty(phone), OfflineSaleRecord::getSalePhone, phone)
-                .like(StringUtils.isNotEmpty(websitName), OfflineSaleRecord::getWebsitName, websitName)
-                .like(StringUtils.isNotEmpty(websitNumber), OfflineSaleRecord::getWebsitNumber, websitNumber)
-                .like(StringUtils.isNotEmpty(category), OfflineSaleRecord::getGoodsCategory, category)
-                .ge(minAmount != null, OfflineSaleRecord::getSaleAmount, minAmount)
-                .le(maxAmount != null, OfflineSaleRecord::getSaleAmount, maxAmount)
-                .ge(StringUtils.isNotEmpty(startTime), OfflineSaleRecord::getSaleTime, startTime)
-                .le(StringUtils.isNotEmpty(endTime), OfflineSaleRecord::getSaleTime, endTime)
-                .orderByDesc(OfflineSaleRecord::getCreateTime)
-                .page(new Page<>(pageNum, pageSize));
-
-        return page;
-    }
-
-
-    public void delete( String id) {
-        offlineSaleRecordService.removeById(id);
-    }
-
-
-    public OfflineSaleRecord detail( String id) {
-        return offlineSaleRecordService.getById(id);
-    }
-
-    public String save(HttpServletRequest request,OfflineSaleRecord offlineSaleRecord) {
-        /*AdminWebsitBean adminWebsitBean = CommonUtils.getAdminUser(request);*/
-       /* offlineSaleRecord.setAdminUserId(adminWebsitBean.getAdminUserId());*/
-//        offlineSaleRecord.setZoneId();
-
-        AdminUserCom adminUser = commonLogic.getAdminUser(request);
-
-        offlineSaleRecord.setAdminUserId(adminUser.getLoginCompanyWechatId());
-        offlineSaleRecord.setCompanyName(adminUser.getLoginCompanyName());
-        offlineSaleRecord.setCreateTime(new Date());
-        offlineSaleRecordService.save(offlineSaleRecord);
-        return offlineSaleRecord.getId();
-    }
-
-    public void update(OfflineSaleRecord offlineSaleRecord) {
-        offlineSaleRecordService.updateById(offlineSaleRecord);
-    }
-
-    public ExcelData exportData(List<OfflineSaleRecord> list){
-        String[] titles = new String[]{"网点编号","网点名称","区域","销售员名称","销售员手机号","销售金额","销售数量"
-                ,"销售日期","销售类型","商品类型","商品名称","状态","创建时间"};
-
-        List<List<Object>> rows = new ArrayList<>();
-        for(OfflineSaleRecord bean:list){
-            List<Object> row = new ArrayList<>();
-            row.add(bean.getWebsitNumber());
-            row.add(bean.getWebsitName());
-            row.add(bean.getZoneName());
-            row.add(bean.getSaleManName());
-            row.add(bean.getSalePhone());
-            row.add(bean.getSaleAmount());
-            row.add(bean.getSaleNum());
-            row.add(DateUtils.formatDate(bean.getSaleTime()));
-            row.add(OfflineSaleRecordSaleTypeEnum.valueOf(bean.getSaleType()).getName());
-            row.add(bean.getGoodsCategory());
-            row.add(bean.getGoodsName());
-            row.add(bean.getStatus()?"正常":"异常");
-            row.add(DateUtils.formatDate(bean.getCreateTime()));
-            rows.add(row);
-        }
-        ExcelData excelData = new ExcelData();
-        excelData.setTitles(Arrays.asList(titles));
-        excelData.setRows(rows);
-        return excelData;
-    }
-}

src/main/java/com/gree/mall/manager/logic/template/TemplateLogic.java

@@ -7,7 +7,6 @@ import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.template.TemplateBean;
 import com.gree.mall.manager.bean.template.TemplateDetailBean;
 import com.gree.mall.manager.commonmapper.CustomGoodsMapper;
-import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.logic.goods.GoodsLogic;
 import com.gree.mall.manager.plus.entity.CommonTemplate;
@@ -18,7 +17,6 @@ import com.gree.mall.manager.plus.service.GoodsTemplateService;
 import com.gree.mall.manager.plus.service.PubTemplateService;
 import com.gree.mall.manager.utils.DateUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -55,7 +53,7 @@ public class TemplateLogic {
         }
         //获取当前登录企业微信id
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        List<String> companyWechatIds = adminUser.getAdminCompanyIds();
+        List<String> companyIds = adminUser.getAdminCompanyIds();
 
         return commonTemplateService.lambdaQuery()
                 .orderByAsc(CommonTemplate::getCommonTemplateId)
@@ -112,7 +110,7 @@ public class TemplateLogic {
 
 
         PubTemplate pubTemplate = new PubTemplate();
-        pubTemplate.setPubTemplateId(adminUser.getLoginCompanyWechatId());
+        pubTemplate.setPubTemplateId(null);
         pubTemplate.setContent(templateBean.getContent());
         pubTemplate.setName("公共模块");
         pubTemplate.setCreateTime(new Date());

src/main/java/com/gree/mall/manager/logic/user/MsgSubscriptLogic.java

@@ -13,8 +13,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -74,8 +72,8 @@ public class MsgSubscriptLogic {
             data.put("character_string5", keyword4);
         }
         User user = userService.getById(userId);
-        String template = WxConfiguration.temFhNotice.get(user.getCompanyWechatId());
-        String res = sendWxMsg(openId, data, template, "pages/mine/order/detail?orderId="+orderId,user.getCompanyWechatId());
+        String template = WxConfiguration.temFhNotice.get(null);
+        String res = sendWxMsg(openId, data, template, "pages/mine/order/detail?orderId="+orderId,null);
         log.info("-----------------完成发货通知消息返回：" + res);
     }
 

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

@@ -113,7 +113,7 @@ public class UserLogic {
 
         LambdaQueryWrapper<User> memberLambdaQueryWrapper = new LambdaQueryWrapper<>();
         memberLambdaQueryWrapper
-                .in(CollectionUtils.isNotEmpty(companyWechatIds), User::getCompanyWechatId, companyWechatIds)
+                .in(CollectionUtils.isNotEmpty(companyWechatIds), User::getCompanyId, companyWechatIds)
                 .in(CollectionUtils.isNotEmpty(adminWebsitIds), User::getWebsitId, adminWebsitIds)
                 .eq(isExchangeCode != null,User::getIsExchangeCode,isExchangeCode)
                 .eq(promotionGroupLeader != null, User::getPromotionGroupLeader, promotionGroupLeader)
@@ -464,7 +464,7 @@ public class UserLogic {
         UserWxBean userWxBean = new UserWxBean();
         BeanUtils.copyProperties(user, userWxBean);
 
-        AdminCompanyWechat adminCompanyWechat = commonLogic.getAdminCompanyWechat(user.getCompanyWechatId());
+        AdminCompanyWechat adminCompanyWechat = commonLogic.getAdminCompanyWechat(user.getCompanyId());
 
         //查询客户数
         Integer count = userService.lambdaQuery().eq(User::getServiceId, userId).count();
@@ -608,7 +608,7 @@ public class UserLogic {
                                                    String position, String mobile, Integer pageNum, Integer pageSize) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         return userServiceWaitService.lambdaQuery()
-                .eq(UserServiceWait::getCompanyWechatId, adminUser.getCompanyWechatId())
+                .eq(UserServiceWait::getCompanyId, adminUser.getCompanyId())
                 .eq(CollectionUtils.isNotEmpty(adminUser.getAdminWebsitIds()),UserServiceWait::getWebsitId, adminUser.getAdminWebsitIds())
                 .like(StringUtils.isNotBlank(websitId), UserServiceWait::getWebsitId, websitId)
                 .like(StringUtils.isNotBlank(websitName), UserServiceWait::getWebsitName, websitName)

src/main/java/com/gree/mall/manager/zfire/util/FieldUtils.java

@@ -96,7 +96,7 @@ public class FieldUtils {
         //todo 框架自带防注入
         bean.setQuery(supplyParam(bean.getParams()));
         if (StringUtils.isNotBlank(bean.getCompanyWechatId())) {
-            bean.setQuery(bean.getQuery() + " and a.company_wechat_id = '" + bean.getCompanyWechatId() + "'");
+            bean.setQuery(bean.getQuery() + " and a.company_id = '" + bean.getCompanyWechatId() + "'");
         }
         if (bean.getClazzType() != null) {
             bean.setSelected(buildSelectColumn(bean.getClazzType()));
@@ -110,9 +110,6 @@ public class FieldUtils {
     }
 
     public static ZfireParamBean supplyParam(ZfireParamBean bean, Class cls, AdminUserCom adminUser) {
-        if (Objects.nonNull(adminUser.getAdminCompanyWechat())) {
-            bean.setCompanyWechatId(adminUser.getAdminCompanyWechat().getCompanyWechatId());
-        }
         bean.setCompanyIds(adminUser.getAdminCompanyIds());
         bean.setAdminWebsitIds(adminUser.getAdminWebsitIds());
         //限制最多查询10w条
@@ -122,7 +119,7 @@ public class FieldUtils {
         //todo 框架自带防注入
         bean.setQuery(supplyParam(bean.getParams()));
         if (StringUtils.isNotBlank(bean.getCompanyWechatId())) {
-            bean.setQuery(bean.getQuery() + " and a.company_wechat_id = '" + bean.getCompanyWechatId() + "'");
+            bean.setQuery(bean.getQuery() + " and a.company_id = '" + bean.getCompanyWechatId() + "'");
         }
         if (bean.getClazzType() != null) {
             bean.setSelected(buildSelectColumn(bean.getClazzType()));

src/main/resources/mapper/AdminMapper.xml

@@ -5,7 +5,7 @@
     <select id="mchList" resultType="com.gree.mall.manager.plus.entity.AdminUser">
         select a.* from admin_user a
         join admin_user_company_rela b on a.admin_user_id = b.admin_user_id
-        join admin_company_wechat c on c.company_wechat_id = b.company_wechat_id
+        join admin_company_wechat c on c.company_wechat_id = b.company_id
         <where>
             <if test="userName != null and userName !=''">
                 a.user_name like concat('%',#{userName},'%')
@@ -27,7 +27,7 @@
     </select>
 
     <select id="queryAdminCompanyWechat" resultType="com.gree.mall.manager.plus.entity.AdminCompanyWechat">
-        select b.* from admin_user_company_rela a join admin_company_wechat b on a.company_wechat_id = b.company_wechat_id
+        select b.* from admin_user_company_rela a join admin_company_wechat b on a.company_id = b.company_wechat_id
       where  b.del=0
       <if test="adminUserId != null and adminUserId !=''">
           and a.admin_user_id = #{adminUserId}
@@ -48,9 +48,9 @@
             <if test="userName != null and userName != ''">
                 and u.user_name like concat('%',#{userName},'%')
             </if>
-            <if test="companyWechatIds != null and companyWechatIds.size > 0">
-                and aucr.company_wechat_id in
-                <foreach item="item" index="index" collection="companyWechatIds" open="(" separator="," close=")">
+            <if test="companyIds != null and companyIds.size > 0">
+                and aucr.company_id in
+                <foreach item="item" index="index" collection="companyIds" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
@@ -61,7 +61,7 @@
     <sql id="adminUserAllCol">
         b.admin_user_id, b.nick_name,b.status,b.role_id,b.role_name,b.last_login_time,b.user_name,
         b.password,b.link_name,b.link_phone,b.email,b.address,b.never_exprise,b.del as del2,b.create_time as create_time2,
-        b.type,b.company_wechat_id as company_wechat_id2,b.company_name as company_name2
+        b.type,b.company_id as company_wechat_id2,b.company_name as company_name2
     </sql>
 
     <select id="list" resultType="com.gree.mall.manager.bean.admin.AdminDeptWebsitVO">
@@ -82,9 +82,9 @@
         left join sys_dict_type_company b on a.dict_type=b.dict_type
         ${ex.query}
         and a.del=0
-        <if test="companyWechatIds != null and companyWechatIds.size > 0">
-            AND a.company_wechat_id IN
-            <foreach item="item" index="index" collection="companyWechatIds" open="(" separator="," close=")">
+        <if test="companyIds != null and companyIds.size > 0">
+            AND a.company_id IN
+            <foreach item="item" index="index" collection="companyIds" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>

src/main/resources/mapper/CommonMapper.xml

@@ -29,7 +29,7 @@
             ums_supplement_record a
         ${ex.query}
         <if test="ex.companyIds != null and ex.companyIds.size > 0">
-            and company_wechat_id in
+            and company_id in
             <foreach item="item" index="index" collection="ex.companyIds" open="(" separator="," close=")">
                 #{item}
             </foreach>

src/main/resources/mapper/CountMapper.xml

@@ -9,7 +9,7 @@
             sum(if(order_status ='DFH',1,0)) 'dfh',
             (select count(1) from order_refund where order_status not in ('OVER','CLOSE')
                 <if test="companyWechatIds != null and companyWechatIds.size > 0">
-                    and company_wechat_id in
+                    and company_id in
                     <foreach item="item" index="index" collection="companyWechatIds" open="(" separator="," close=")">
                         #{item}
                     </foreach>
@@ -28,7 +28,7 @@
         from order_info
         <where>
             <if test="companyWechatIds != null and companyWechatIds.size > 0">
-                and company_wechat_id in
+                and company_id in
                 <foreach item="item" index="index" collection="companyWechatIds" open="(" separator="," close=")">
                     #{item}
                 </foreach>
@@ -55,7 +55,7 @@
           and b.work_order_type=#{workOrderType}
         </if>
         <if test="companyWechatIds != null and companyWechatIds.size > 0">
-            and a.company_wechat_id in
+            and a.company_id in
             <foreach item="item" index="index" collection="companyWechatIds" open="(" separator="," close=")">
                 #{item}
             </foreach>
@@ -75,7 +75,7 @@
         where a.create_time BETWEEN #{startTime} and #{endTime} and a.order_status not in ('NOPAY','CLOSE','TIMEOUT')
 
         <if test="companyWechatIds != null and companyWechatIds.size > 0">
-            and a.company_wechat_id in
+            and a.company_id in
             <foreach item="item" index="index" collection="companyWechatIds" open="(" separator="," close=")">
                 #{item}
             </foreach>
@@ -95,7 +95,7 @@
     <select id="countVisit" resultType="java.lang.Integer">
         select count(DISTINCT user_id) total from user_visit where visit_time BETWEEN #{startTime} and #{endTime}
         <if test="companyWechatIds != null and companyWechatIds.size > 0">
-            and company_wechat_id in
+            and company_id in
             <foreach item="item" index="index" collection="companyWechatIds" open="(" separator="," close=")">
                 #{item}
             </foreach>
@@ -120,7 +120,7 @@
             select category_id from goods_category where name like '%清洗%'
         )
         <if test="companyWechatIds != null and companyWechatIds.size > 0">
-            and a.company_wechat_id in
+            and a.company_id in
             <foreach item="item" index="index" collection="companyWechatIds" open="(" separator="," close=")">
                 #{item}
             </foreach>
@@ -165,7 +165,7 @@
             and a.admin_websit_id = #{adminWebsitId}
         </if>
         <if test="companyWechatIds != null and companyWechatIds.size > 0">
-            and a.company_wechat_id in
+            and a.company_id in
             <foreach item="item" index="index" collection="companyWechatIds" open="(" separator="," close=")">
                 #{item}
             </foreach>

src/main/resources/mapper/CouponDateMapper.xml

@@ -70,9 +70,9 @@
             <if test="couponName != null and couponName !=''">
                 cp.coupon_name like concat('%',#{couponName,jdbcType=VARCHAR},'%')
             </if>
-            <if test="companyWechatIds != null and companyWechatIds.size > 0">
-                and cp.company_wechat_id in
-                <foreach item="item" index="index" collection="companyWechatIds" open="(" separator="," close=")">
+            <if test="companyIds != null and companyIds.size > 0">
+                and cp.company_id in
+                <foreach item="item" index="index" collection="companyIds" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
@@ -122,9 +122,9 @@
             <if test="couponName != null and couponName !=''">
                 and cp.coupon_name like concat('%',#{couponName,jdbcType=VARCHAR},'%')
             </if>
-            <if test="companyWechatIds != null and companyWechatIds.size > 0">
-                and cp.company_wechat_id in
-                <foreach item="item" index="index" collection="companyWechatIds" open="(" separator="," close=")">
+            <if test="companyIds != null and companyIds.size > 0">
+                and cp.company_id in
+                <foreach item="item" index="index" collection="companyIds" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
@@ -139,9 +139,9 @@
         order_info oi on oi.user_coupon_id=uc.id and oi.order_status&lt;>'CLOSE'
         left join coupon cp on cp.coupon_id= uc.coupon_id
         left join user ur on ur.user_id = uc.user_id
-        left join admin_company_wechat acw on acw.company_wechat_id = ur.company_wechat_id
+        left join admin_company_wechat acw on acw.company_wechat_id = ur.company_id
         left join enterprise_wechat_worker eww on eww.wechat_user_id = ur.work_user_id and eww.corp_id = acw.corp_id
-        LEFT JOIN admin_websit aw on eww.main_department = aw.id
+        LEFT JOIN admin_websit aw on eww.main_department = aw.websit_id
         <where>
             uc.self_use = 1
             <if test="flag != null and flag != ''">
@@ -167,9 +167,9 @@
             <if test="couponName != null and couponName !=''">
                 and cp.coupon_name like concat('%',#{couponName,jdbcType=VARCHAR},'%')
             </if>
-            <if test="companyWechatIds != null and companyWechatIds.size > 0">
+            <if test="companyIds != null and companyIds.size > 0">
                 and cp.company_wechat_id in
-                <foreach item="item" index="index" collection="companyWechatIds" open="(" separator="," close=")">
+                <foreach item="item" index="index" collection="companyIds" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
@@ -219,7 +219,7 @@
         fROM user ur
 
         where ur.type = 'SERVICE'
-         and ur.company_wechat_id = #{companyWechatId}
+         and ur.company_id = #{companyId}
          and not EXISTS(
             select uc.user_id
             from user_coupon uc

src/main/resources/mapper/CustomGoodsCategoryMapper.xml

@@ -37,10 +37,10 @@
             <if test='name != null'>
                 AND name like concat('%',#{name,jdbcType=VARCHAR},'%')
             </if>
-            <if test=' companyWechatIds != null and companyWechatIds.size > 0' >
-                AND company_wechat_id in
-                <foreach collection="companyWechatIds" open="(" close=")" item="companyWechatId" separator=",">
-                     #{companyWechatId}
+            <if test=' companyIds != null and companyIds.size > 0' >
+                AND company_id in
+                <foreach collection="companyIds" open="(" close=")" item="companyId" separator=",">
+                     #{companyId}
                 </foreach>
             </if>
         </where>

src/main/resources/mapper/CustomGoodsMapper.xml

@@ -21,7 +21,7 @@
         WHERE
         t1.del = 0
         <if test='companyWechatId != null and companyWechatId != "" ' >
-            AND FIND_IN_SET( #{companyWechatId},t1.company_wechat_id) > 0
+            AND FIND_IN_SET( #{companyWechatId},t1.company_id) > 0
 
         </if>
         <if test='goodsTypes != null and goodsTypes.size > 0' >
@@ -99,7 +99,7 @@
         from goods
         where del = false
         <if test=' companyWechatIds != null and companyWechatIds.size > 0' >
-            AND company_wechat_id in
+            AND company_id in
             <foreach collection="companyWechatIds" open="(" close=")" item="companyWechatId" separator=",">
                 #{companyWechatId}
             </foreach>
@@ -112,7 +112,7 @@
               from goods_spec
               where del = false
                 <if test=' companyWechatIds != null and companyWechatIds.size > 0' >
-                    AND company_wechat_id in
+                    AND company_id in
                     <foreach collection="companyWechatIds" open="(" close=")" item="companyWechatId" separator=",">
                         #{companyWechatId}
                     </foreach>
@@ -129,7 +129,7 @@
           AND t2.flag = 1
           and t2.del = 0
         <if test=' companyWechatIds != null and companyWechatIds.size > 0' >
-            AND t1.company_wechat_id in
+            AND t1.company_id in
             <foreach collection="companyWechatIds" open="(" close=")" item="companyWechatId" separator=",">
                 #{companyWechatId}
             </foreach>
@@ -146,7 +146,7 @@
     <update id="syncGoodsSpecInnerShareMsg" parameterType="java.lang.String">
         update goods_spec
         set inner_share_amount = share_amount , inner_share_percent = share_percent
-        where inner_share_amount is null and inner_share_amount is null and company_wechat_id = #{companyWechatId}
+        where inner_share_amount is null and inner_share_amount is null and company_id = #{companyWechatId}
     </update>
 
 
@@ -171,7 +171,7 @@
             where a.goods_type='PACKAGE'
         and a.del = 0
         <if test='companyWechatIds != null and companyWechatIds.size > 0' >
-            AND a.company_wechat_id  in
+            AND a.company_id  in
             <foreach collection="companyWechatIds" open="(" close=")" item="companyWechatId" separator=",">
                 #{companyWechatId}
             </foreach>

src/main/resources/mapper/CustomMemberMapper.xml

@@ -8,10 +8,10 @@
         left join admin_websit aw on aw.id = eww.main_department
         where
         ur.status =1
-        <if test=' companyWechatIds != null and companyWechatIds.size > 0' >
-            and ur.company_wechat_id in
-            <foreach collection="companyWechatIds" open="(" close=")" item="companyWechatId" separator=",">
-                #{companyWechatId}
+        <if test=' companyIds != null and companyIds.size > 0' >
+            and ur.company_id in
+            <foreach collection="companyIds" open="(" close=")" item="companyId" separator=",">
+                #{companyId}
             </foreach>
         </if>
         <if test="type != null and type !=''">

src/main/resources/mapper/CustomTagGroupMapper.xml

@@ -6,7 +6,7 @@
         FROM tag_group tg
         left join tag ta on tg.tag_group_id=ta.group_id
         <if test=' companyWechatIds != null and companyWechatIds.size > 0' >
-            where  tg.company_wechat_id in
+            where  tg.company_id in
             <foreach collection="companyWechatIds" open="(" close=")" item="companyWechatId" separator=",">
                 #{companyWechatId}
             </foreach>

src/main/resources/mapper/LuckDrawMapper.xml

@@ -25,9 +25,9 @@
             <if test="status != null">
                 and a.status = #{status}
             </if>
-            <if test="companyWechatIds != null and companyWechatIds.size > 0">
-                and a.company_wechat_id in
-                <foreach item="item" index="index" collection="companyWechatIds" open="(" separator="," close=")">
+            <if test="companyIds != null and companyIds.size > 0">
+                and a.company_id in
+                <foreach item="item" index="index" collection="companyIds" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
@@ -89,9 +89,9 @@
             <if test="status2 != null">
                 and if(c.status=0,0,if(c.status=1 and c.order_id ='',1,2)) = #{status2}
             </if>
-            <if test="companyWechatIds != null and companyWechatIds.size > 0">
-                and a.company_wechat_id in
-                <foreach item="item" index="index" collection="companyWechatIds" open="(" separator="," close=")">
+            <if test="companyIds != null and companyIds.size > 0">
+                and a.company_id in
+                <foreach item="item" index="index" collection="companyIds" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>

src/main/resources/mapper/OrderMapper.xml

@@ -102,7 +102,7 @@
                 and o.promotion_package_goods_id = #{goodsId}
             </if>
             <if test="companyWechatIds != null and companyWechatIds.size > 0">
-                and o.company_wechat_id in
+                and o.company_id in
                 <foreach item="item" index="index" collection="companyWechatIds" open="(" separator="," close=")">
                     #{item}
                 </foreach>
@@ -181,7 +181,7 @@
                 and comment_express &gt; 0 and comment_service &gt; 0 and comment_goods &gt; 0
             </if>
             <if test="companyWechatIds != null and companyWechatIds.size > 0">
-                and company_wechat_id in
+                and company_id in
                 <foreach item="item" index="index" collection="companyWechatIds" open="(" separator="," close=")">
                     #{item}
                 </foreach>

src/main/resources/mapper/OrderRefundInfoMapper.xml

@@ -59,7 +59,7 @@
                 and ord.examine_time between #{startExamineTime} and #{endExamineTime}
             </if>
             <if test="companyWechatIds != null and companyWechatIds.size > 0">
-                and ord.company_wechat_id in
+                and ord.company_id in
                 <foreach item="item" index="index" collection="companyWechatIds" open="(" separator="," close=")">
                     #{item}
                 </foreach>

src/main/resources/mapper/OrderShareReportMapper.xml

@@ -106,8 +106,7 @@
         left join order_info oi  on os.order_id = oi.order_id
         left JOIN order_tax ot on oi.order_id = ot.order_id
         left join admin_company_wechat acw on os.company_wechat_id = acw.company_wechat_id
-        left join enterprise_wechat_worker eww on (os.work_user_id = eww.wechat_user_id and acw.corp_id= eww.corp_id)
-        left JOIN admin_websit aw on eww.main_department = aw.id
+        left JOIN admin_websit aw on eww.main_department = aw.websit_id
         left JOIN express_company ec on ec.code = oi.company_code
         where os.order_share_id in
         <foreach item="item" index="index" collection="orderShareIdList" open="(" separator=","

src/main/resources/mapper/SecKillMapper.xml

@@ -34,7 +34,7 @@
             and sas.goods_name like concat('%',#{keyword,jdbcType=VARCHAR},'%')
         </if>
         <if test="companyWechatIds != null and companyWechatIds.size > 0">
-            and sa.company_wechat_id in
+            and sa.company_id in
             <foreach item="item" index="index" collection="companyWechatIds" open="(" separator="," close=")">
                 #{item}
             </foreach>
@@ -85,7 +85,7 @@
                 and unix_timestamp(ska.start_time) > unix_timestamp(#{startTime})
             </if>
             <if test="companyWechatIds != null and companyWechatIds.size > 0">
-                and ska.company_wechat_id in
+                and ska.company_id in
                 <foreach item="item" index="index" collection="companyWechatIds" open="(" separator="," close=")">
                     #{item}
                 </foreach>
@@ -156,7 +156,7 @@
             and gds.category_id = #{categoryId}
         </if>
         <if test="companyWechatIds != null and companyWechatIds.size > 0">
-            and gds.company_wechat_id in
+            and gds.company_id in
             <foreach item="item" index="index" collection="companyWechatIds" open="(" separator="," close=")">
                 #{item}
             </foreach>
@@ -177,7 +177,7 @@
             and gds.category_id = #{categoryId}
         </if>
         <if test="companyWechatIds != null and companyWechatIds.size > 0">
-            and gs.company_wechat_id in
+            and gs.company_id in
             <foreach item="item" index="index" collection="companyWechatIds" open="(" separator="," close=")">
                 #{item}
             </foreach>

src/main/resources/mapper/SopRulePushMapper.xml

@@ -4,7 +4,7 @@
     <resultMap id="BaseResultMap" type="com.gree.mall.manager.bean.sop.SopRuleData">
         <id column="id" jdbcType="VARCHAR" property="id"/>
         <result column="rule_name" jdbcType="VARCHAR" property="ruleName"/>
-        <result column="company_wechat_id" jdbcType="VARCHAR" property="companyWechatId"/>
+        <result column="company_id" jdbcType="VARCHAR" property="companyId"/>
         <result column="company_name" jdbcType="VARCHAR" property="companyName"/>
         <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
@@ -34,7 +34,7 @@
                 <result column="sort_num" jdbcType="INTEGER" property="sortNum"/>
                 <result column="deleted" jdbcType="BIT" property="deleted"/>
                 <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
-                <result column="company_wechat_id" jdbcType="VARCHAR" property="companyWechatId"/>
+                <result column="company_id" jdbcType="VARCHAR" property="companyId"/>
                 <result column="company_name" jdbcType="VARCHAR" property="companyName"/>
             </collection>
         </collection>
@@ -71,9 +71,9 @@
         <if test="status != null and status != ''">
             and sr.status = #{status}
         </if>
-        <if test="companyWechatIds != null">
-            and sr.company_wechat_id in
-            <foreach collection="companyWechatIds" item="item" open="(" separator="," close=")" index="index">
+        <if test="companyIds != null">
+            and sr.company_id in
+            <foreach collection="companyIds" item="item" open="(" separator="," close=")" index="index">
                 #{item}
             </foreach>
         </if>
@@ -121,7 +121,7 @@
             <result column="sort_num" jdbcType="INTEGER" property="sortNum"/>
             <result column="deleted" jdbcType="BIT" property="deleted"/>
             <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
-            <result column="company_wechat_id" jdbcType="VARCHAR" property="companyWechatId"/>
+            <result column="company_id" jdbcType="VARCHAR" property="companyId"/>
             <result column="company_name" jdbcType="VARCHAR" property="companyName"/>
         </collection>
     </resultMap>

src/main/resources/mapper/TaxMapper.xml

@@ -34,7 +34,7 @@
                 and ot.order_id like concat('%',#{orderId},'%')
             </if>
             <if test="companyWechatIds != null and companyWechatIds.size > 0">
-                and ot.company_wechat_id in
+                and ot.company_id in
                 <foreach item="item" index="index" collection="companyWechatIds" open="(" separator="," close=")">
                     #{item}
                 </foreach>

src/main/resources/mapper/WxCustomerMapper.xml

@@ -22,7 +22,7 @@
         from user_tag ut
         left JOIN user ur on ut.union_id = ur.union_id
         WHERE
-        ur.company_wechat_id = #{companyWechatId}
+        ur.company_id = #{companyWechatId}
         and ut.tag_id in
         <foreach item="item" index="index" collection="couponTags" open="(" separator="," close=")">
             #{item.tagId}
@@ -124,7 +124,7 @@
         WHERE
             a.user_id = b.user_id
         <if test="companyWechatIds != null and companyWechatIds.size > 0">
-            AND b.company_wechat_id IN
+            AND b.company_id IN
             <foreach item="item" index="index" collection="companyWechatIds" open="(" separator="," close=")">
                 #{item}
             </foreach>