Merge remote-tracking branch 'origin/develop' into develop

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/CommonMapper.java

@@ -50,6 +50,8 @@ public interface CommonMapper {
      */
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     public List<WebsitVO> websitList(
+            @Param("rice") Integer rice,
+            @Param("websitName") String websitName,
             @Param("lng") String lng,
             @Param("lat") String lat,
             @Param("websitIds") List<String> websitIds,

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

@@ -238,9 +238,11 @@ public class UserController {
             @RequestParam(required = false) List<String> examineStatus,
             @ApiParam(value = "增值服务ID",required = false) @RequestParam(required = false) String increId,
             @ApiParam(value = "经度",required = false) @RequestParam(required = false) String lng,
-            @ApiParam(value = "纬度",required = false) @RequestParam(required = false) String lat
+            @ApiParam(value = "纬度",required = false) @RequestParam(required = false) String lat,
+            @ApiParam(value = "单位米，距离",required = false) @RequestParam(required = false) Integer rice,
+            @ApiParam(value = "网点名称",required = false) @RequestParam(required = false) String websitName
     ){
-        List<AdminWebsitApplyBean> adminWebsitApplyBeans = userLogic.websitList(isAll,increId,isIncre,lng,lat,examineStatus);
+        List<AdminWebsitApplyBean> adminWebsitApplyBeans = userLogic.websitList(rice,websitName,isAll,increId,isIncre,lng,lat,examineStatus);
         return ResponseHelper.success(adminWebsitApplyBeans);
     }
 

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

@@ -1164,7 +1164,7 @@ public class UserLogic {
      *
      * @return
      */
-    public List<AdminWebsitApplyBean> websitList(Boolean isAll, String increId, Boolean isIncre, String lng, String lat,List<String> examineStatus) {
+    public List<AdminWebsitApplyBean> websitList(Integer rice,String websitName,Boolean isAll, String increId, Boolean isIncre, String lng, String lat,List<String> examineStatus) {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
 //        List<AdminWebsit> list = adminWebsitService.lambdaQuery()
 //                .eq(AdminWebsit::getCompanyWechatId, currentCompanyWechat.getCurrentCompanyWechatId())
@@ -1219,7 +1219,7 @@ public class UserLogic {
 
         }
 
-        List<WebsitVO> list = commonMapper.websitList(lng, lat, websitIds,websitIdsQuchu, isIncre, currentCompanyWechat.getCompanyWechatId());
+        List<WebsitVO> list = commonMapper.websitList(rice,websitName,lng, lat, websitIds,websitIdsQuchu, isIncre, currentCompanyWechat.getCompanyWechatId());
 
         List<AdminWebsitApplyBean> adminWebsitApplyBeans = BeanUtil.copyToList(list, AdminWebsitApplyBean.class);
         for (AdminWebsitApplyBean bean : adminWebsitApplyBeans) {

mall-miniapp-service/src/main/resources/mapper/CommonMapper.xml

@@ -79,6 +79,9 @@
             <if test="isIncre != null">
                 and a.is_incre = #{isIncre}
             </if>
+        <if test="websitName != null and websitName != ''">
+            AND a.name LIKE  CONCAT('%', #{websitName},'%')
+        </if>
             <if test="websitIds != null and websitIds.size > 0">
                 AND a.websit_id IN
                 <foreach item="item" index="index" collection="websitIds" open="(" separator="," close=")">
@@ -94,7 +97,7 @@
 
             and a.company_wechat_id = #{companyWechatId}
         <if test="websitIdsQuchu != null and websitIdsQuchu.size > 0 and lng != '0'.toString() and lat != '0'.toString()">
-            HAVING distance &lt; 50000
+            HAVING distance &lt; #{rice}
         </if>
         ORDER BY distance
     </select>

mall-miniapp-service/src/main/resources/mapper/workorder/OrderBaseCMapper.xml

@@ -16,6 +16,7 @@
         from pg_order_base a
         left join pg_order_worker b on a.id = b.order_base_id
     where ((b.worker_id=#{workerId} or b.worker_number=#{workerNumber}) or a.order_status = 'DQD') and a.order_status not in ('YQX','FWQX','FL','FWZT','YCGB')
+    and b.websit_id = a.websit_id
     <if test="isYb != null and isYb == true">
         and a.pg_incre_order_id != ''
     </if>

mall-server-api/src/main/java/com/gree/mall/manager/bean/workorder/DispatchVO.java

@@ -48,16 +48,6 @@ public class DispatchVO {
     private String streetName;
 
 
-    @ZfireField(tbName = "b")
-    @ApiModelProperty(value = "工单渠道")
-    private String dictValue;
-
-
-    @ZfireField(tbName = "b",hide = true)
-    @ApiModelProperty(value = "工单渠道id")
-    private String dictCode;
-
-
     @ZfireField(tbName = "c")
     @ApiModelProperty(value = "工单类型")
     private String orderSmallTypeText;
@@ -76,12 +66,12 @@ public class DispatchVO {
 
 
     @ZfireField(tbName = "e",colName = "dict_value")
-    @ApiModelProperty(value = "工单来源")
-    private String orderSource;
+    @ApiModelProperty(value = "承接渠道")
+    private String saleTypeName;
 
-    @ZfireField(tbName = "e",hide = true)
-    @ApiModelProperty(value = "工单来源id")
-    private String orderSourceId;
+    @ZfireField(tbName = "e",hide = true,colName = "dict_code")
+    @ApiModelProperty(value = "承接渠道")
+    private String saleTypeId;
 
 
 

mall-server-api/src/main/java/com/gree/mall/manager/bean/workorder/WebsitDispatchAdd.java

@@ -17,8 +17,8 @@ public class WebsitDispatchAdd {
     @ApiModelProperty(value = "街道id")
     private String streetCode;
 
-    @ApiModelProperty(value = "工单渠道")
-    private List<String> orderChannelIds;
+    @ApiModelProperty(value = "承接渠道ids")
+    private List<String> salesTypeIds;
 
     @ApiModelProperty(value = "工单类型")
     private List<String> orderSmallIds;
@@ -26,8 +26,6 @@ public class WebsitDispatchAdd {
     @ApiModelProperty(value = "产品大类")
     private List<String> categoryIds;
 
-    @ApiModelProperty(value = "工单来源")
-    private List<String> orderSourceIds;
 
 
 

mall-server-api/src/main/java/com/gree/mall/manager/bean/workorder/WebsitDispatchVO.java

@@ -44,12 +44,6 @@ public class WebsitDispatchVO    {
     @ApiModelProperty(value = "街道id")
     private String streetCode;
 
-    @ApiModelProperty(value = "工单渠道")
-    private String dictValue;
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "工单渠道id")
-    private String dictCode;
-
     @ApiModelProperty(value = "工单类型")
     private String orderSmallTypeText;
     @ZfireField(hide = true)
@@ -62,11 +56,11 @@ public class WebsitDispatchVO    {
     @ApiModelProperty(value = "产品大类id")
     private String categoryId;
 
-    @ApiModelProperty(value = "工单来源")
-    private String orderSource;
+    @ApiModelProperty(value = "承接渠道")
+    private String saleTypeName;
     @ZfireField(hide = true)
-    @ApiModelProperty(value = "工单来源id")
-    private String orderSourceId;
+    @ApiModelProperty(value = "承接渠道id")
+    private String saleTypeId;
 
     @ApiModelProperty(value = "网点编号")
     private String websitId;

mall-server-api/src/main/java/com/gree/mall/manager/constant/SysDictConstant.java

@@ -9,6 +9,7 @@ public class SysDictConstant {
     public final static String BRAND="BRAND";
     //工单渠道
     public final static String ORDER_CHANNEL = "ORDER_CHANNEL";
+    public final static String SALES_TYPE = "SALES_TYPE";
 
     //工单来源
     public final static String ORDER_SOURCE = "WORKER_ORDER_SOURCE";

mall-server-api/src/main/java/com/gree/mall/manager/controller/admin/AdminUserController.java

@@ -150,11 +150,12 @@ public class AdminUserController {
             @ApiParam(value = "状态 true:正常 false:冻结",required = false) @RequestParam(required = false) Boolean status,
             @ApiParam(value = "用户名",required = false) @RequestParam(required = false) String userName,
             @ApiParam(value = "网点id",required = false) @RequestParam(required = false) String websitId,
+            @ApiParam(value = "是否需要网点账号",required = false) @RequestParam(required = false) Boolean isWebsit,
             @ApiParam(value = "页号",required = true) @RequestParam(required = true) Integer pageNum,
             @ApiParam(value = "页大小",required = true) @RequestParam(required = true) Integer pageSize,
             HttpServletRequest request
     ) throws RemoteServiceException {
-        IPage<AdminUser> page = adminUserLogic.list(companyWechatId,companyWechatName,roleId,status,userName,pageNum, pageSize,websitId);
+        IPage<AdminUser> page = adminUserLogic.list(isWebsit,companyWechatId,companyWechatName,roleId,status,userName,pageNum, pageSize,websitId);
         return ResponseHelper.success(page);
     }
 

mall-server-api/src/main/java/com/gree/mall/manager/controller/admin/AdminWebsitController.java

@@ -50,15 +50,14 @@ public class AdminWebsitController {
             @RequestParam(required = false) Boolean status,
             @RequestParam(required = false) Boolean isIncre,
             @RequestParam(required = false) String streetCode,
-            @RequestParam(required = false) String channelId,
             @RequestParam(required = false) String categoryId,
-            @RequestParam(required = false) String orderSourceId,
+            @RequestParam(required = false) String saleTypeId,
             @RequestParam(required = false) String orderSmallId,
             @RequestParam(required = false) Boolean queryPartsWebsit,
             @RequestParam(required = false)   @ApiParam(value = "网点属性 SELF=自建网点 MAJOR=第三方专业网点 MERCHANT=第三方经销商家网点")String attr,
             @RequestParam(required = false) Integer level
     ) {
-        List<AdminWebsit> list = adminWebsitLogic.list(attr,websitId,websitName,type, isAll, isIncre, status, streetCode, channelId, categoryId, orderSmallId, orderSourceId, queryPartsWebsit, level);
+        List<AdminWebsit> list = adminWebsitLogic.list(attr,websitId,websitName,type, isAll, isIncre, status, streetCode, saleTypeId, categoryId, orderSmallId, queryPartsWebsit, level);
         return ResponseHelper.success(list);
     }
 
@@ -71,12 +70,11 @@ public class AdminWebsitController {
             @ApiParam(value = "状态") @RequestParam(required = false) Boolean status,
             @ApiParam(value = "是否增值网点") @RequestParam(required = false) Boolean isIncre,
             @ApiParam(value = "街道id") @RequestParam(required = false) String streetCode,
-            @ApiParam(value = "渠道") @RequestParam(required = false) String channelId,
+            @ApiParam(value = "承接渠道") @RequestParam(required = false) String saleTypeId,
             @ApiParam(value = "产品大类") @RequestParam(required = false) String categoryId,
-            @ApiParam(value = "工单来源") @RequestParam(required = false) String orderSource,
             @ApiParam(value = "工单类型") @RequestParam(required = false) String orderSmallId
     ) {
-        List<AdminWebsitList> list = adminWebsitLogic.websitList(type, isAll, isIncre, status, streetCode, channelId, categoryId, orderSmallId, orderSource);
+        List<AdminWebsitList> list = adminWebsitLogic.websitList(type, isAll, isIncre, status, streetCode, saleTypeId, categoryId, orderSmallId);
         return ResponseHelper.success(list);
     }
 

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

@@ -30,6 +30,7 @@ import com.gree.mall.manager.utils.http.HttpUtils;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import okhttp3.Response;
 import org.apache.velocity.util.ArrayListWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -255,12 +256,12 @@ public class SyncOrderInfoLogic {
             List<ItfGreeSynDownloadRec> itfGreeSynDownloadRecList = itfGreeSynDownloadRecs.stream()
                     .sorted(Comparator.comparing(ItfGreeSynDownloadRec::getUpdatedTimestamp).reversed()).collect(Collectors.toList());
 
-            itfGreeSynDownloadRecService.lambdaUpdate().in(ItfGreeSynDownloadRec::getWorkOrderId,
+   /*         itfGreeSynDownloadRecService.lambdaUpdate().in(ItfGreeSynDownloadRec::getWorkOrderId,
                     itfGreeSynDownloadRecs.stream().map(ItfGreeSynDownloadRec::getWorkOrderId)
                             .collect(Collectors.toList()))
                     .eq(ItfGreeSynDownloadRec::getGreeStatSynStatus,0)
                     .set(ItfGreeSynDownloadRec::getGreeStatSynStatus,9)
-                    .update();
+                    .update();*/
 
             itfGreeSynDownloadRecService.saveBatch(itfGreeSynDownloadRecs);
 
@@ -292,6 +293,9 @@ public class SyncOrderInfoLogic {
         forms.put("client_secret", Collections.singletonList(v3ClientSecert));
 
         forms.put("grant_type", Collections.singletonList("client_credentials"));
+
+       // log.info("打印接口和传的用户"+v3TokenUrl+",传参"+clientId+",se:"+v3ClientSecert);
+
         String s = HttpUtils.requestXwww(v3TokenUrl, forms);
         //String s = HttpUtils.requestPostForm(tokenUrl, map, null);
         //log.info("【获取总部token】response:{}", s);
@@ -306,14 +310,13 @@ public class SyncOrderInfoLogic {
     }
 
 
-    @Transactional(rollbackFor = Exception.class)
     public void syncDetail() {
 
         while (true) {
 
 
             List<ItfGreeSynDownloadRec> itfGreeSynDownloadRecs = itfGreeSynDownloadRecService.lambdaQuery()
-                    .in(ItfGreeSynDownloadRec::getGreeStatSynStatus, 0, 99)
+                    .in(ItfGreeSynDownloadRec::getGreeStatSynStatus, 0)
                     .last("limit 20")
                     .orderByAsc(ItfGreeSynDownloadRec::getGreeStatSynStatus)
                     .list();
@@ -351,7 +354,13 @@ public class SyncOrderInfoLogic {
                 String json = JSONUtil.toJsonStr(workOrderSearchReq);
 
 
-                String body = HttpUtils.requestPostBody(greeUrl + Constant.gree.POST_WORKER_ORDER_DETAIL, json, heard);
+               // Response body = HttpUtils.requestPostBody(, json, heard);
+
+                String body = HttpRequest.post(greeUrl + Constant.gree.POST_WORKER_ORDER_DETAIL)
+                        .header("authorization", "Bearer " + accessToken)
+                        .body(json).execute().body();
+
+                log.info("工单同步详情返回：" + body+"同步token"+heard.toString()+"请求参数"+json);
 
                 Map<String, Object> bodyMap = JSON.parseObject(body);
                 String s = bodyMap.get("data").toString();
@@ -532,7 +541,7 @@ public class SyncOrderInfoLogic {
 
                 itfGreeSynDownloadRecService.lambdaUpdate()
                         .in(ItfGreeSynDownloadRec::getSynReqId, syncIds)
-                        .set(ItfGreeSynDownloadRec::getGreeStatSynErrMsg, e.getMessage())
+                        .set(ItfGreeSynDownloadRec::getGreeStatSynErrMsg, e.toString())
                         .set(ItfGreeSynDownloadRec::getGreeStatSynTime, new Date())
                         .set(ItfGreeSynDownloadRec::getGreeStatSynStatus, 99).update();
 

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

@@ -568,7 +568,7 @@ public class AdminUserLogic {
      *
      * @return
      */
-    public IPage<AdminUser> list(String companyWechatId, String companyWechatName, String roleId, Boolean status, String userName, Integer pageNum, Integer pageSize,String websitId) {
+    public IPage<AdminUser> list(Boolean isWebsit,String companyWechatId, String companyWechatName, String roleId, Boolean status, String userName, Integer pageNum, Integer pageSize,String websitId) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
         if (adminUser.getType() != 2) {
@@ -600,6 +600,7 @@ public class AdminUserLogic {
                 .like(StringUtils.isNotBlank(companyWechatName), AdminUser::getCompanyName, companyWechatName)
                 .eq(StringUtils.isNotBlank(roleId), AdminUser::getRoleId, roleId)
                 .eq(status != null, AdminUser::getStatus, status)
+                .eq(isWebsit != null && !isWebsit, AdminUser::getType, 1)
                 .and(StringUtils.isNotBlank(userName), v -> v.like(AdminUser::getUserName, userName)
                         .or()
                         .like(AdminUser::getNickName, userName))

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

@@ -133,8 +133,8 @@ public class AdminWebsitLogic {
         return parentList;
     }
 
-    public List<AdminWebsit> list(String attr,String websitId,String websitName,String type, Boolean isAll, Boolean isIncre, Boolean status, String streetCode, String channelId, String categoryId,
-                                  String orderSmallId, String orderSourceId, Boolean queryPartsWebsit, Integer level) {
+    public List<AdminWebsit> list(String attr,String websitId,String websitName,String type, Boolean isAll, Boolean isIncre, Boolean status, String streetCode, String saleTypeId, String categoryId,
+                                  String orderSmallId , Boolean queryPartsWebsit, Integer level) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
 
@@ -143,10 +143,9 @@ public class AdminWebsitLogic {
             websitIds = websitDispatchService.lambdaQuery()
                     .eq(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), WebsitDispatch::getCompanyWechatId, adminUser.getCompanyWechatId())
                     .eq(!StringUtil.isEmpty(streetCode), WebsitDispatch::getStreetCode, streetCode)
-                    .eq(!StringUtil.isEmpty(channelId), WebsitDispatch::getDictCode, channelId)
+                    .eq(!StringUtil.isEmpty(saleTypeId), WebsitDispatch::getSaleTypeId, saleTypeId)
                     .eq(!StringUtil.isEmpty(categoryId), WebsitDispatch::getCategoryId, categoryId)
                     .eq(!StringUtil.isEmpty(orderSmallId), WebsitDispatch::getOrderSmallId, orderSmallId)
-                    .eq(!StringUtil.isEmpty(orderSourceId), WebsitDispatch::getOrderSource, orderSourceId)
                     .like(!StringUtil.isEmpty(websitId), WebsitDispatch::getWebsitId, websitId)
                     .like(!StringUtil.isEmpty(websitName), WebsitDispatch::getWebsitName, websitName)
                     .list().stream().map(WebsitDispatch::getWebsitId).collect(Collectors.toList());
@@ -1192,8 +1191,8 @@ public class AdminWebsitLogic {
         return excelData;
     }
 
-    public List<AdminWebsitList> websitList(String type, Boolean isAll, Boolean isIncre, Boolean status, String streetCode, String channelId, String categoryId,
-                                            String orderSmallId, String orderSourceId) {
+    public List<AdminWebsitList> websitList(String type, Boolean isAll, Boolean isIncre, Boolean status, String streetCode, String saleTypeId, String categoryId,
+                                            String orderSmallId) {
 
             AdminUserCom adminUser = commonLogic.getAdminUser();
 
@@ -1203,10 +1202,9 @@ public class AdminWebsitLogic {
                 websitIds = websitDispatchService.lambdaQuery()
                         .eq(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), WebsitDispatch::getCompanyWechatId, adminUser.getCompanyWechatId())
                         .eq(!StringUtil.isEmpty(streetCode), WebsitDispatch::getStreetCode, streetCode)
-                        .eq(!StringUtil.isEmpty(channelId), WebsitDispatch::getDictCode, channelId)
+                        .eq(!StringUtil.isEmpty(saleTypeId), WebsitDispatch::getSaleTypeId, saleTypeId)
                         .eq(!StringUtil.isEmpty(categoryId), WebsitDispatch::getCategoryId, categoryId)
                         .eq(!StringUtil.isEmpty(orderSmallId), WebsitDispatch::getOrderSmallId, orderSmallId)
-                        .eq(!StringUtil.isEmpty(orderSourceId), WebsitDispatch::getOrderSource, orderSourceId)
                         .list().stream().map(WebsitDispatch::getWebsitId).collect(Collectors.toList());
             }
 

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

@@ -82,6 +82,9 @@ public class BigLogic {
     @Autowired
     RedisUtil redisUtil;
 
+    @Autowired
+    WebsitUserService websitUserService;
+
 
     public String getRegion(String country, String province, String city, String area) {
 
@@ -250,7 +253,7 @@ public class BigLogic {
 
 
         List<String> companyIds = adminUser.getCompanyWechatIds();
-
+        List<String> websitIds = adminUser.getAdminWebsitIds();
 
 
         Integer loginComapnyNum = userLogService.lambdaQuery().eq(UserLog::getLoginType, IsYesNoEnum.YES.getKey())
@@ -266,23 +269,35 @@ public class BigLogic {
                 .between(UserLog::getCreateTime, DateUtil.offsetDay(DateUtil.beginOfDay(new Date()), -1), DateUtil.offsetDay(DateUtil.endOfDay(new Date()), -1))
                 .count();
 
-        Integer allWorker = userService.lambdaQuery().eq(User::getType, UserTypeEnum.WORKER.getKey())
-                .in(!CollectionUtils.isEmpty(companyIds), User::getCompanyWechatId, companyIds)
-                .count();
+        Integer allWorker = websitUserService.lambdaQuery()
+                .in(!CollectionUtils.isEmpty(websitIds) && !adminUser.getIsMaster(),WebsitUser::getWebsitId, websitIds)
+                .groupBy(WebsitUser::getUserId)
+                .select(WebsitUser::getId).list().size();
 
 
-        Integer allWorkerLogin = userLogService.lambdaQuery().eq(UserLog::getLoginType, IsYesNoEnum.NO.getKey())
+        List<String> userIds = userLogService.lambdaQuery().eq(UserLog::getLoginType, IsYesNoEnum.NO.getKey())
                 .eq(UserLog::getMiniType, UserTypeEnum.WORKER.getKey())
                 .eq(UserLog::getType, "LOGIN")
                 .in(!CollectionUtils.isEmpty(companyIds), UserLog::getCompanyWechatId, companyIds)
-                .between(UserLog::getCreateTime, DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date())).count();
+                .between(UserLog::getCreateTime, DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date()))
+                .select(UserLog::getUserId)
+                .list().stream().map(UserLog::getUserId).collect(Collectors.toList());
+
+
+        Integer allWorkerLogin = CollectionUtils.isEmpty(userIds)?0:websitUserService.lambdaQuery()
+                .in(CollectionUtils.isEmpty(websitIds) && !adminUser.getIsMaster(),WebsitUser::getWebsitId, websitIds).in(WebsitUser::getUserId,userIds).count();
+
 
-        Integer allWorkerLoginBefore = userLogService.lambdaQuery().eq(UserLog::getLoginType, IsYesNoEnum.YES.getKey())
+        List<String> userIdBefores = userLogService.lambdaQuery().eq(UserLog::getLoginType, IsYesNoEnum.YES.getKey())
                 .eq(UserLog::getMiniType, UserTypeEnum.WORKER.getKey())
                 .eq(UserLog::getType, "LOGIN")
                 .in(!CollectionUtils.isEmpty(companyIds), UserLog::getCompanyWechatId, companyIds)
-                .between(UserLog::getCreateTime, DateUtil.offsetDay(DateUtil.beginOfDay(new Date()), -1), DateUtil.offsetDay(DateUtil.endOfDay(new Date()), -1)).count();
+                .between(UserLog::getCreateTime, DateUtil.offsetDay(DateUtil.beginOfDay(new Date()), -1), DateUtil.offsetDay(DateUtil.endOfDay(new Date()), -1))
+                .select(UserLog::getUserId)
+                .list().stream().map(UserLog::getUserId).collect(Collectors.toList());
 
+        Integer allWorkerLoginBefore = CollectionUtils.isEmpty(userIdBefores)?0:websitUserService.lambdaQuery()
+                .in(CollectionUtils.isEmpty(websitIds) &&!adminUser.getIsMaster(),WebsitUser::getWebsitId, websitIds).in(WebsitUser::getUserId,userIdBefores).count();
 
         Integer allService = userService.lambdaQuery().eq(User::getType, UserTypeEnum.SERVICE.getKey())
                 .in(!CollectionUtils.isEmpty(companyIds), User::getCompanyWechatId, companyIds).count();
@@ -395,8 +410,10 @@ public class BigLogic {
     public LargeMpBean getLarge4() {
 
         AdminUserCom adminUser = commonLogic.getAdminUser();
+        List<String> websitIds = adminUser.getAdminWebsitIds();
         List<WebsitSales> websitSales = websitSalesService.lambdaQuery()
                 .in(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), WebsitSales::getCompanyWechatId, adminUser.getCompanyWechatId())
+                .in(!CollectionUtils.isEmpty(websitIds) && !adminUser.getIsMaster(), WebsitSales::getWebsitId, websitIds)
                 .eq(WebsitSales::getPayFlag, "YES")
                 .ne(WebsitSales::getFlag, "IMPORT_ERR")
                 .between(WebsitSales::getCreateTime, DateUtil.offsetDay(DateUtil.beginOfDay(new Date()), -30), new Date())
@@ -414,6 +431,7 @@ public class BigLogic {
 
         List<WebsitSalesRet> websitSalesRets = websitSalesRetService.lambdaQuery()
                 .in(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), WebsitSalesRet::getCompanyWechatId, adminUser.getCompanyWechatId())
+                .in(!CollectionUtils.isEmpty(websitIds)  && !adminUser.getIsMaster(), WebsitSalesRet::getWebsitId, websitIds)
                 .eq(WebsitSalesRet::getRetState, "OK")
                 .between(WebsitSalesRet::getCreateTime, DateUtil.offsetDay(DateUtil.beginOfDay(new Date()), -30), new Date())
                 .select(WebsitSalesRet::getSalesRetId, WebsitSalesRet::getGoodsType, WebsitSalesRet::getRetState).list();
@@ -430,6 +448,7 @@ public class BigLogic {
 
         List<WebsitPartsRet> websitPartsRets = websitPartsRetService.lambdaQuery()
                 .in(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), WebsitPartsRet::getCompanyWechatId, adminUser.getCompanyWechatId())
+                .in(!CollectionUtils.isEmpty(websitIds)  && !adminUser.getIsMaster(), WebsitPartsRet::getWebsitId, websitIds)
                 .eq(WebsitPartsRet::getFlag, "SUBMIT")
                 .between(WebsitPartsRet::getCreateTime, DateUtil.offsetDay(DateUtil.beginOfDay(new Date()), -30), new Date())
                 .select(WebsitPartsRet::getFlag, WebsitPartsRet::getGoodsType, WebsitPartsRet::getPartsRetId, WebsitPartsRet::getType)
@@ -483,7 +502,8 @@ public class BigLogic {
 
         List<PgOrderBase> pgOrderBases = pgOrderBaseService.lambdaQuery()
                 .in(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), PgOrderBase::getCompanyWechatId, adminUser.getCompanyWechatId())
-                .ne(PgOrderBase::getOrderStatus, "YQX")
+                .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()) &&  !adminUser.getIsMaster(), PgOrderBase::getWebsitId, adminUser.getAdminWebsitIds())
+                .notIn(PgOrderBase::getOrderStatus, "YQX","FWZT","YCGB","FWQX","FL")
                 .between(PgOrderBase::getCreateTime, DateUtil.offsetDay(DateUtil.beginOfDay(new Date()), -30), new Date())
                 .select(PgOrderBase::getOrderSmallTypeText, PgOrderBase::getId, PgOrderBase::getTotalNum, PgOrderBase::getUndoneNum,
                         PgOrderBase::getSaleType).list();
@@ -562,7 +582,8 @@ public class BigLogic {
 
         List<PgOrderBase> pgOrderBases = pgOrderBaseService.lambdaQuery()
                 .in(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), PgOrderBase::getCompanyWechatId, adminUser.getCompanyWechatId())
-                .ne(PgOrderBase::getOrderStatus, "YQX")
+                .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()) &&  !adminUser.getIsMaster(), PgOrderBase::getWebsitId, adminUser.getAdminWebsitIds())
+                .notIn(PgOrderBase::getOrderStatus, "YQX","FWZT","YCGB","FWQX","FL")
                 .between(PgOrderBase::getCreateTime, DateUtil.offsetDay(DateUtil.beginOfDay(new Date()), -30), new Date())
                 .select(PgOrderBase::getOrderSmallTypeText, PgOrderBase::getId, PgOrderBase::getTotalNum, PgOrderBase::getUndoneNum, PgOrderBase::getCreateTime,
                         PgOrderBase::getSaleType).list();
@@ -631,6 +652,7 @@ public class BigLogic {
 
         List<SettlementOrder> settlementOrderList = settlementOrderService.lambdaQuery()
                 .in(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), SettlementOrder::getCompanyWechatId, adminUser.getCompanyWechatId())
+                .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()) && !adminUser.getIsMaster(), SettlementOrder::getWebsitId, adminUser.getAdminWebsitIds())
                 .between(SettlementOrder::getCreateTime, DateUtil.offsetDay(DateUtil.beginOfDay(new Date()), -30), new Date())
                 .select(SettlementOrder::getOrderId, SettlementOrder::getTotalAmount, SettlementOrder::getGoodsType)
                 .list();
@@ -681,6 +703,8 @@ public class BigLogic {
 
         List<SettlementOrder> settlementOrderList = settlementOrderService.lambdaQuery()
                 .in(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), SettlementOrder::getCompanyWechatId, adminUser.getCompanyWechatId())
+                .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()) && !adminUser.getIsMaster(), SettlementOrder::getWebsitId, adminUser.getAdminWebsitIds())
+
                 .between(SettlementOrder::getCreateTime, DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), -30)), new Date())
                 .select(SettlementOrder::getOrderId, SettlementOrder::getTotalAmount, SettlementOrder::getGoodsType, SettlementOrder::getCreateTime)
                 .list();
@@ -755,6 +779,8 @@ public class BigLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         Page<PgOrderBase> pgOrderBasePage = pgOrderBaseService.lambdaQuery()
                 .in(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), PgOrderBase::getCompanyWechatId, adminUser.getCompanyWechatId())
+                .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()) && !adminUser.getIsMaster(), PgOrderBase::getWebsitId, adminUser.getAdminWebsitIds())
+
                 .eq(PgOrderBase::getCity, city)
                 .eq(PgOrderBase::getProvince, province)
                 .eq(PgOrderBase::getArea, area)
@@ -764,6 +790,8 @@ public class BigLogic {
 
         List<PgOrderBase> pgOrderBaseList = pgOrderBaseService.lambdaQuery()
                 .in(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), PgOrderBase::getCompanyWechatId, adminUser.getCompanyWechatId())
+                .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()) && !adminUser.getIsMaster(), PgOrderBase::getWebsitId, adminUser.getAdminWebsitIds())
+
                 .eq(PgOrderBase::getCity, city)
                 .eq(PgOrderBase::getProvince, province)
                 .eq(PgOrderBase::getArea, area)
@@ -926,6 +954,8 @@ public class BigLogic {
 
         List<PgOrderBase> pgOrderBases = pgOrderBaseService.lambdaQuery()
                 .in(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), PgOrderBase::getCompanyWechatId, adminUser.getCompanyWechatId())
+                .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()) && !adminUser.getIsMaster(), PgOrderBase::getWebsitId, adminUser.getAdminWebsitIds())
+
                 .eq(PgOrderBase::getCity, city)
                 .eq(PgOrderBase::getProvince, province)
                 .ne(PgOrderBase::getOrderStatus, "YQX")
@@ -935,6 +965,8 @@ public class BigLogic {
 
         List<PgOrderBase> pgOrderBaseList = pgOrderBaseService.lambdaQuery()
                 .in(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), PgOrderBase::getCompanyWechatId, adminUser.getCompanyWechatId())
+                .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()) && !adminUser.getIsMaster(), PgOrderBase::getWebsitId, adminUser.getAdminWebsitIds())
+
                 .eq(PgOrderBase::getCity, city)
                 .eq(PgOrderBase::getProvince, province)
                 .ne(PgOrderBase::getOrderStatus, "YQX")
@@ -947,6 +979,10 @@ public class BigLogic {
         List<String> status = new ArrayList<>();
         status.add("YWG");
         status.add("YJS");
+        status.add("LRCD");
+        status.add("YWGO");
+        status.add("GCSZX");
+        status.add("WDWG");
 
 
         for (PgOrderBase pgOrderBase : pgOrderBases) {
@@ -991,6 +1027,8 @@ public class BigLogic {
 
         List<PgOrderBase> pgOrderBaseList = pgOrderBaseService.lambdaQuery()
                 .in(!StringUtil.isEmpty(adminUser.getCompanyWechatId()), PgOrderBase::getCompanyWechatId, adminUser.getCompanyWechatId())
+                .in(!CollectionUtils.isEmpty(adminUser.getAdminWebsitIds()) && !adminUser.getIsMaster(), PgOrderBase::getWebsitId, adminUser.getAdminWebsitIds())
+
                 .eq(PgOrderBase::getCity, city)
                 .eq(PgOrderBase::getProvince, province)
                 .ne(PgOrderBase::getOrderStatus, "YQX")

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/PolicyOrderLogic.java

@@ -333,7 +333,8 @@ public class PolicyOrderLogic {
                     .eq(PolicyOrder::getType, "EM")
                     .in(PolicyOrder::getPolicyOrderStatus, PolicyOrderEmStutasEnum.XG.getKey(),
                             PolicyOrderEmStutasEnum.DSX.getKey(),
-                            PolicyOrderEmStutasEnum.KTH.getKey()
+                            PolicyOrderEmStutasEnum.KTH.getKey(),
+                            PolicyOrderEmStutasEnum.DTH.getKey()
 
                     ).remove();
 

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

@@ -108,14 +108,14 @@ public class ChangeOrderLogic {
 
 
     @Transactional(rollbackFor = Exception.class)
-    public void changeAppointmentTime(String id, String appointmentTime, String appointmentEndTime,String remark,String imgSrc) {
+    public void changeAppointmentTime(String id, String appointmentTime, String appointmentEndTime, String remark, String imgSrc) {
         pgOrderBaseService.lambdaUpdate()
-                .eq(PgOrderBase::getId,id)
-                .set(!StringUtils.isEmpty(remark),PgOrderBase::getChangeRemark,remark)
-                .set(!StringUtils.isEmpty(remark),PgOrderBase::getAppointmentRemark,remark)
-                .set(PgOrderBase::getAppointmentTime,appointmentTime)
-                .set(PgOrderBase::getAppointmentEndTime,appointmentEndTime)
-                .set(PgOrderBase::getLastOperatorAppointmentTime,new Date())
+                .eq(PgOrderBase::getId, id)
+                .set(!StringUtils.isEmpty(remark), PgOrderBase::getChangeRemark, remark)
+                .set(!StringUtils.isEmpty(remark), PgOrderBase::getAppointmentRemark, remark)
+                .set(PgOrderBase::getAppointmentTime, appointmentTime)
+                .set(PgOrderBase::getAppointmentEndTime, appointmentEndTime)
+                .set(PgOrderBase::getLastOperatorAppointmentTime, new Date())
                 .update();
 
 //        pgOrderBaseService.lambdaUpdate()
@@ -123,10 +123,10 @@ public class ChangeOrderLogic {
 //                .eq(PgOrderBase::getOrderStatus,OrderBaseStatusEnum.DYY.getKey())
 //                .set(PgOrderBase::getOrderStatus,OrderBaseStatusEnum.DSHPG).update();
 
-        this.addLog(id,imgSrc);
+        this.addLog(id, imgSrc);
     }
 
-    private void addLog(String id,String imgSrc) {
+    private void addLog(String id, String imgSrc) {
         PgOrderBase pgOrderBase = pgOrderBaseService.getById(id);
 
         PgOrderOperatorLog pgOrderOperatorLog = new PgOrderOperatorLog();
@@ -151,7 +151,6 @@ public class ChangeOrderLogic {
         List<PgOrderWorker> pgOrderWorkers = new ArrayList<>();
 
 
-
         boolean isDa = true;
 
         User userOne = userService.getById(workerIds.get(0));
@@ -179,26 +178,26 @@ public class ChangeOrderLogic {
 
 
         pgOrderBaseService.lambdaUpdate()
-                .in(PgOrderBase::getId,ids)
-                .set(PgOrderBase::getWorkerName,userOne.getNickName())
-                .set(PgOrderBase::getWebsitId,websitId)
-                .set(PgOrderBase::getWebsitName,adminWebsit.getName())
-                .set(PgOrderBase::getWebsitPhone,adminWebsit.getWebsitPhone())
-                .set(PgOrderBase::getOrderStatus,OrderBaseStatusEnum.DJD.getKey())
-                .set(PgOrderBase::getOrderStatusText,OrderBaseStatusEnum.DJD.getRemark())
-                .set(PgOrderBase::getWorkerIdcard,userOne.getIdCard())
-                .set(PgOrderBase::getWorkerId,userOne.getUserId())
-                .set(PgOrderBase::getWorkerNumber,userOne.getWorkerNumber())
-                .set(PgOrderBase::getWorkerMobile,userOne.getMobile())
-                .set(PgOrderBase::getDispatchTime,new Date())
-                .set(PgOrderBase::getIsQd,false)
+                .in(PgOrderBase::getId, ids)
+                .set(PgOrderBase::getWorkerName, userOne.getNickName())
+                .set(PgOrderBase::getWebsitId, websitId)
+                .set(PgOrderBase::getWebsitName, adminWebsit.getName())
+                .set(PgOrderBase::getWebsitPhone, adminWebsit.getWebsitPhone())
+                .set(PgOrderBase::getOrderStatus, OrderBaseStatusEnum.DJD.getKey())
+                .set(PgOrderBase::getOrderStatusText, OrderBaseStatusEnum.DJD.getRemark())
+                .set(PgOrderBase::getWorkerIdcard, userOne.getIdCard())
+                .set(PgOrderBase::getWorkerId, userOne.getUserId())
+                .set(PgOrderBase::getWorkerNumber, userOne.getWorkerNumber())
+                .set(PgOrderBase::getWorkerMobile, userOne.getMobile())
+                .set(PgOrderBase::getDispatchTime, new Date())
+                .set(PgOrderBase::getIsQd, false)
                 .update();
 
         List<PgOrderBase> list = pgOrderBaseService.lambdaQuery()
                 .in(PgOrderBase::getId, ids).list();
 
         for (PgOrderBase pgOrderBase : list) {
-            if (pgOrderBase.getIsImportExcel()){
+            if (pgOrderBase.getIsImportExcel()) {
                 PgOrderBase pgOrderBase1 = new PgOrderBase();
                 pgOrderBase1.setId(pgOrderBase.getId());
                 pgOrderBase1.setIsMeet(false);
@@ -213,7 +212,7 @@ public class ChangeOrderLogic {
         }
 
 
-        pgOrderWorkerService.lambdaUpdate().in(PgOrderWorker::getOrderBaseId,ids).remove();
+        pgOrderWorkerService.lambdaUpdate().in(PgOrderWorker::getOrderBaseId, ids).remove();
 
         pgOrderWorkerService.saveBatch(pgOrderWorkers);
 
@@ -229,15 +228,15 @@ public class ChangeOrderLogic {
         pgOrderOperatorLog.setOrderBaseId(id);
         pgOrderOperatorLog.setType(OrderOperatorLogTypeEnum.GP.getKey());
         pgOrderOperatorLog.setTypeText(OrderOperatorLogTypeEnum.GP.getRemark());
-        pgOrderOperatorLog.setContent("派工主要工程师："+pgOrderBase.getWorkerName());
+        pgOrderOperatorLog.setContent("派工主要工程师：" + pgOrderBase.getWorkerName());
         orderLogLogic.addLog(pgOrderOperatorLog);
     }
 
 
     public List<PgOrderProductDetail> getOrderProduct(String id, List<String> status) {
 
-        return pgOrderProductDetailService.lambdaQuery().eq(PgOrderProductDetail::getOrderBaseId,id)
-                .in(!CollectionUtils.isEmpty(status),PgOrderProductDetail::getStatus,status).list();
+        return pgOrderProductDetailService.lambdaQuery().eq(PgOrderProductDetail::getOrderBaseId, id)
+                .in(!CollectionUtils.isEmpty(status), PgOrderProductDetail::getStatus, status).list();
     }
 
     public PgOrderProductDetailVO productDetail(String id) {
@@ -263,7 +262,7 @@ public class ChangeOrderLogic {
     public List<WorkerOrderDetail> getOrderList(String workerOrderId) {
 
         List<WorkerOrder> list = workerOrderService.lambdaQuery().eq(WorkerOrder::getWorkerOrderId, workerOrderId)
-                .in(WorkerOrder::getPayStatus,PayStatusEnum.WAIT.getKey(),PayStatusEnum.PAID.getKey()).list();
+                .in(WorkerOrder::getPayStatus, PayStatusEnum.WAIT.getKey(), PayStatusEnum.PAID.getKey()).list();
         if (CollectionUtils.isEmpty(list))
             return new ArrayList<>();
 
@@ -271,7 +270,7 @@ public class ChangeOrderLogic {
         for (WorkerOrderDetail workerOrder : workerOrderDetails1) {
 
             workerOrder.setWorkerOrderItems(workerOrderItemService.lambdaQuery()
-                    .eq(WorkerOrderItem::getOrderId,workerOrder.getOrderId()).list());
+                    .eq(WorkerOrderItem::getOrderId, workerOrder.getOrderId()).list());
 
             PgOrderBase pgOrderBase = pgOrderBaseService.getById(workerOrderId);
             workerOrder.setPgOrderBase(pgOrderBase);
@@ -280,8 +279,6 @@ public class ChangeOrderLogic {
         }
 
 
-
-
         return workerOrderDetails1;
 
     }
@@ -296,17 +293,17 @@ public class ChangeOrderLogic {
         zfireParam = FieldUtils.supplyParam(zfireParam, DispatchVO.class);
 
         List<WebsitDispatch> websitDispatches = websitDispatchService.lambdaQuery().eq(WebsitDispatch::getCompanyWechatId, adminUser.getCompanyWechatId())
-                .select(WebsitDispatch::getStreetCode, WebsitDispatch::getDictCode, WebsitDispatch::getOrderSmallId,
-                        WebsitDispatch::getCategoryId, WebsitDispatch::getOrderSourceId)
+                .select(WebsitDispatch::getStreetCode, WebsitDispatch::getSaleTypeId, WebsitDispatch::getOrderSmallId,
+                        WebsitDispatch::getCategoryId)
                 .list();
 
         List<String> codeList = new ArrayList<>();
         for (WebsitDispatch websitDispatch : websitDispatches) {
-            codeList.add(websitDispatch.getStreetCode()+websitDispatch.getDictCode()+websitDispatch.getOrderSmallId()
-            +websitDispatch.getCategoryId()+websitDispatch.getOrderSourceId());
+            codeList.add(websitDispatch.getStreetCode() + websitDispatch.getSaleTypeId() + websitDispatch.getOrderSmallId()
+                    + websitDispatch.getCategoryId());
         }
 
-        IPage<DispatchVO> dispatchVOIPage = increMapper.listDispatch(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam,adminCompanyIds,codeList);
+        IPage<DispatchVO> dispatchVOIPage = increMapper.listDispatch(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam, adminCompanyIds, codeList);
 
         return dispatchVOIPage;
 
@@ -331,7 +328,7 @@ public class ChangeOrderLogic {
         //1.组装查询条件
         zfireParamBean = FieldUtils.supplyParam(zfireParamBean, WebsitDispatchVO.class);
 
-        IPage<WebsitDispatchVO> websitDispatchVOIPage = increMapper.listDispatchWebsit(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParamBean,adminCompanyIds);
+        IPage<WebsitDispatchVO> websitDispatchVOIPage = increMapper.listDispatchWebsit(new Page(zfireParamBean.getPageNum(), zfireParamBean.getPageSize()), zfireParamBean, adminCompanyIds);
 
         return websitDispatchVOIPage;
     }
@@ -341,56 +338,56 @@ public class ChangeOrderLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
         List<String> adminCompanyIds = adminUser.getCompanyWechatIds();
-        return increMapper.pList(pId,  cityCode,  areaCode,  streetCode,  dictCode,  orderSmallId,  categoryId, orderSourceId,adminCompanyIds);
+        return increMapper.pList(pId, cityCode, areaCode, streetCode, dictCode, orderSmallId, categoryId, orderSourceId, adminCompanyIds);
     }
 
-    public List<DispatchCherVO> cList(String pId, String cityCode, String areaCode, String streetCode,List<String> dictCode, List<String> orderSmallId, List<String> categoryId, List<String> orderSourceId) {
+    public List<DispatchCherVO> cList(String pId, String cityCode, String areaCode, String streetCode, List<String> dictCode, List<String> orderSmallId, List<String> categoryId, List<String> orderSourceId) {
         //获取当前登录企业id
         AdminUserCom adminUser = commonLogic.getAdminUser();
         List<String> adminCompanyIds = adminUser.getCompanyWechatIds();
-        return increMapper.cList(pId,  cityCode,  areaCode,  streetCode,  dictCode,  orderSmallId,  categoryId, orderSourceId,adminCompanyIds);
+        return increMapper.cList(pId, cityCode, areaCode, streetCode, dictCode, orderSmallId, categoryId, orderSourceId, adminCompanyIds);
     }
 
     public List<DispatchCherVO> aList(String pId, String cityCode, String areaCode, String streetCode, List<String> dictCode, List<String> orderSmallId, List<String> categoryId, List<String> orderSourceId) {
         //获取当前登录企业id
         AdminUserCom adminUser = commonLogic.getAdminUser();
         List<String> adminCompanyIds = adminUser.getCompanyWechatIds();
-        return increMapper.aList(pId,  cityCode,  areaCode,  streetCode,  dictCode,  orderSmallId,  categoryId, orderSourceId,adminCompanyIds);
+        return increMapper.aList(pId, cityCode, areaCode, streetCode, dictCode, orderSmallId, categoryId, orderSourceId, adminCompanyIds);
     }
 
     public List<DispatchCherVO> sList(String pId, String cityCode, String areaCode, String streetCode, List<String> dictCode, List<String> orderSmallId, List<String> categoryId, List<String> orderSourceId) {
         //获取当前登录企业id
         AdminUserCom adminUser = commonLogic.getAdminUser();
         List<String> adminCompanyIds = adminUser.getCompanyWechatIds();
-        return increMapper.sList(pId,  cityCode,  areaCode,  streetCode,  dictCode,  orderSmallId,  categoryId, orderSourceId,adminCompanyIds);
+        return increMapper.sList(pId, cityCode, areaCode, streetCode, dictCode, orderSmallId, categoryId, orderSourceId, adminCompanyIds);
     }
 
     public List<DispatchCherVO> channel(String pId, String cityCode, String areaCode, String streetCode, List<String> dictCode, List<String> orderSmallId, List<String> categoryId, List<String> orderSourceId) {
         //获取当前登录企业id
         AdminUserCom adminUser = commonLogic.getAdminUser();
         List<String> adminCompanyIds = adminUser.getCompanyWechatIds();
-        return increMapper.channel(pId,  cityCode,  areaCode,  streetCode,  dictCode,  orderSmallId,  categoryId, orderSourceId,adminCompanyIds);
+        return increMapper.channel(pId, cityCode, areaCode, streetCode, dictCode, orderSmallId, categoryId, orderSourceId, adminCompanyIds);
     }
 
     public List<DispatchCherVO> smallList(String pId, String cityCode, String areaCode, String streetCode, List<String> dictCode, List<String> orderSmallId, List<String> categoryId, List<String> orderSourceId) {
         //获取当前登录企业id
         AdminUserCom adminUser = commonLogic.getAdminUser();
         List<String> adminCompanyIds = adminUser.getCompanyWechatIds();
-        return increMapper.smallList(pId,  cityCode,  areaCode,  streetCode,  dictCode,  orderSmallId,  categoryId, orderSourceId,adminCompanyIds);
+        return increMapper.smallList(pId, cityCode, areaCode, streetCode, dictCode, orderSmallId, categoryId, orderSourceId, adminCompanyIds);
     }
 
     public List<DispatchCherVO> categoryList(String pId, String cityCode, String areaCode, String streetCode, List<String> dictCode, List<String> orderSmallId, List<String> categoryId, List<String> orderSourceId) {
         //获取当前登录企业id
         AdminUserCom adminUser = commonLogic.getAdminUser();
         List<String> adminCompanyIds = adminUser.getCompanyWechatIds();
-        return increMapper.categoryList(pId,  cityCode,  areaCode,  streetCode,  dictCode,  orderSmallId,  categoryId, orderSourceId,adminCompanyIds);
+        return increMapper.categoryList(pId, cityCode, areaCode, streetCode, dictCode, orderSmallId, categoryId, orderSourceId, adminCompanyIds);
     }
 
     public List<DispatchCherVO> sourceList(String pId, String cityCode, String areaCode, String streetCode, List<String> dictCode, List<String> orderSmallId, List<String> categoryId, List<String> orderSourceId) {
         //获取当前登录企业id
         AdminUserCom adminUser = commonLogic.getAdminUser();
         List<String> adminCompanyIds = adminUser.getCompanyWechatIds();
-        return increMapper.sourceList(pId,  cityCode,  areaCode,  streetCode,  dictCode,  orderSmallId,  categoryId, orderSourceId,adminCompanyIds);
+        return increMapper.sourceList(pId, cityCode, areaCode, streetCode, dictCode, orderSmallId, categoryId, orderSourceId, adminCompanyIds);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -409,54 +406,47 @@ public class ChangeOrderLogic {
 
                 GoodsCategory goodsCategory = goodsCategoryService.getById(categoryId);
 
-                for (String orderChannel : websitDispatchAdd.getOrderChannelIds()) {
-
-                    SysDictCompany orderChanne = sysDictCompanyService.lambdaQuery().eq(SysDictCompany::getDictCode, orderChannel).last("limit 1").one();
+                for (String salesId : websitDispatchAdd.getCategoryIds()) {
 
-                    for (String orderSourceId : websitDispatchAdd.getOrderSourceIds()) {
+                    SysDictCompany sales = sysDictCompanyService.lambdaQuery().eq(SysDictCompany::getDictCode, salesId).last("limit 1").one();
 
 
-                        SysDictCompany orderSource = sysDictCompanyService.lambdaQuery().eq(SysDictCompany::getDictCode, orderSourceId).last("limit 1").one();
+                    WebsitDispatch websitDispatch = new WebsitDispatch();
+                    websitDispatch.setWebsitId(adminWebsit.getWebsitId());
+                    websitDispatch.setWebsitName(adminWebsit.getName());
+                    websitDispatch.setProvinceCode(region.getProvinceCode());
+                    websitDispatch.setProvinceName(region.getProvinceName());
+                    websitDispatch.setCityCode(region.getCityCode());
+                    websitDispatch.setCityName(region.getCityName());
+                    websitDispatch.setAreaCode(region.getAreaCode());
+                    websitDispatch.setAreaName(region.getAreaName());
+                    websitDispatch.setStreetCode(region.getId());
+                    websitDispatch.setStreetName(region.getName());
+                    websitDispatch.setCompanyWechatId(adminWebsit.getCompanyWechatId());
+                    websitDispatch.setCompanyWechatName(adminWebsit.getCompanyWechatName());
 
-                        WebsitDispatch websitDispatch = new WebsitDispatch();
-                        websitDispatch.setWebsitId(adminWebsit.getWebsitId());
-                        websitDispatch.setWebsitName(adminWebsit.getName());
-                        websitDispatch.setProvinceCode(region.getProvinceCode());
-                        websitDispatch.setProvinceName(region.getProvinceName());
-                        websitDispatch.setCityCode(region.getCityCode());
-                        websitDispatch.setCityName(region.getCityName());
-                        websitDispatch.setAreaCode(region.getAreaCode());
-                        websitDispatch.setAreaName(region.getAreaName());
-                        websitDispatch.setStreetCode(region.getId());
-                        websitDispatch.setStreetName(region.getName());
-                        websitDispatch.setCompanyWechatId(adminWebsit.getCompanyWechatId());
-                        websitDispatch.setCompanyWechatName(adminWebsit.getCompanyWechatName());
 
+                    websitDispatch.setOrderSmallTypeText(orderSmallType.getOrderSmallTypeText());
+                    websitDispatch.setOrderSmallId(orderSmallType.getId());
 
-                        websitDispatch.setOrderSmallTypeText(orderSmallType.getOrderSmallTypeText());
-                        websitDispatch.setOrderSmallId(orderSmallType.getId());
+                    websitDispatch.setCategoryId(goodsCategory.getCategoryId());
+                    websitDispatch.setCategoryName(goodsCategory.getName());
+                    websitDispatch.setSaleTypeId(sales.getDictCode());
+                    websitDispatch.setSaleTypeName(sales.getDictValue());
 
-                        websitDispatch.setCategoryId(goodsCategory.getCategoryId());
-                        websitDispatch.setCategoryName(goodsCategory.getName());
 
-                        websitDispatch.setDictCode(orderChanne.getDictCode());
-                        websitDispatch.setDictValue(orderChanne.getDictValue());
-
-                        websitDispatch.setOrderSource(orderSource.getDictValue());
-                        websitDispatch.setOrderSourceId(orderSource.getDictCode());
+                    if (websitDispatchService.lambdaQuery().eq(WebsitDispatch::getStreetCode, region.getId())
+                            .eq(WebsitDispatch::getOrderSmallId, websitDispatch.getOrderSmallId())
+                            .eq(WebsitDispatch::getCategoryId, websitDispatch.getCategoryId())
+                            .eq(WebsitDispatch::getSaleTypeId, websitDispatch.getSaleTypeId())
+                            .count() > 0) {
+                        throw new RemoteServiceException("存在街道：" + websitDispatch.getStreetName() + "，产品大类：" + websitDispatch.getCategoryName() +
+                                "，承接渠道：" + websitDispatch.getSaleTypeName() + "，工单类型：" + websitDispatch.getOrderSmallTypeText());
+                    }
 
-                        if (websitDispatchService.lambdaQuery().eq(WebsitDispatch::getStreetCode,region.getId())
-                                .eq(WebsitDispatch::getOrderSmallId,websitDispatch.getOrderSmallId())
-                                .eq(WebsitDispatch::getCategoryId,websitDispatch.getCategoryId())
-                                .eq(WebsitDispatch::getDictCode,websitDispatch.getDictCode())
-                                .eq(WebsitDispatch::getOrderSourceId,websitDispatch.getOrderSourceId()).count() > 0) {
-                            throw new RemoteServiceException("存在街道："+websitDispatch.getStreetName()+"，产品大类："+websitDispatch.getCategoryName()+
-                                    "，工单渠道："+websitDispatch.getDictValue()+"，工单来源："+websitDispatch.getOrderSource()+"，工单类型："+websitDispatch.getOrderSmallTypeText());
-                        }
+                    websitDispatches.add(websitDispatch);
 
-                        websitDispatches.add(websitDispatch);
 
-                    }
                 }
             }
         }
@@ -469,14 +459,13 @@ public class ChangeOrderLogic {
     }
 
 
-
     @Transactional(rollbackFor = Exception.class)
     public void importData(MultipartFile file) throws IOException {
 
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
         List<Object> rows = ExcelUtils.importExcel(file);
-        if(org.apache.commons.collections4.CollectionUtils.isEmpty(rows)){
+        if (org.apache.commons.collections4.CollectionUtils.isEmpty(rows)) {
             throw new RemoteServiceException("导入内容为空");
         }
 
@@ -490,12 +479,10 @@ public class ChangeOrderLogic {
         Map<String, GoodsCategory> categoryMap1 = goodsCategoryList.stream().filter(v -> v.getLevel() == 1)
                 .collect(Collectors.toMap(GoodsCategory::getName, v -> v));
 
-        //工单渠道
-         Map<String, SysDictCompany> orderChannelMap = sysDictCompanyLogic.dictByTypeOfValue(SysDictConstant.ORDER_CHANNEL, adminUser.getCompanyWechatId());
+        //销售渠道
+        Map<String, SysDictCompany> salesMap = sysDictCompanyLogic.dictByTypeOfValue(SysDictConstant.SALES_TYPE, adminUser.getCompanyWechatId());
 
-        //工单渠道
-        Map<String, SysDictCompany> orderSourceMap = sysDictCompanyLogic.dictByTypeOfValue(SysDictConstant.ORDER_SOURCE, adminUser.getCompanyWechatId());
-        //网点名称
+             //网点名称
         Map<String, AdminWebsit> adminWebsitMap = adminWebsitService.lambdaQuery()
                 .eq(AdminWebsit::getCompanyWechatId, adminUser.getCompanyWechatId())
                 .in(adminUser.getType() == 0, AdminWebsit::getWebsitId, adminUser.getAdminWebsitIds())
@@ -503,37 +490,34 @@ public class ChangeOrderLogic {
                 .list().stream().collect(Collectors.toMap(AdminWebsit::getWebsitId, Function.identity()));
 
         List<WebsitDispatch> websitDispatches = new ArrayList<>();
-        for(Object o : rows) {
+        for (Object o : rows) {
             List<Object> row = (List<Object>) o;
 
-            String websitName = (String)row.get(0);
-            String websitId = (String)row.get(1);
-            String pName = (String)row.get(2);
-            String cName = (String)row.get(3);
-            String aName = (String)row.get(4);
-            String sName = (String)row.get(5);
-            String channelName = (String)row.get(6);
-            String smallName = (String)row.get(7);
-            String categoryName = (String)row.get(8);
-            String sourceName = (String)row.get(9);
-
-            String[] channelNames = channelName.split("/");
+            String websitName = (String) row.get(0);
+            String websitId = (String) row.get(1);
+            String pName = (String) row.get(2);
+            String cName = (String) row.get(3);
+            String aName = (String) row.get(4);
+            String sName = (String) row.get(5);
+            String saleName = (String) row.get(6);
+            String smallName = (String) row.get(7);
+            String categoryName = (String) row.get(8);
+
+
+            String[] salesNames = saleName.split("/");
             String[] smallNames = smallName.split("/");
             String[] categoryNames = categoryName.split("/");
-            String[] sourceNames = sourceName.split("/");
+
 
             AdminWebsit adminWebsit = adminWebsitMap.get(websitId);
             Region region = orderBaseLogic.getRegion(pName, cName, aName, sName);
 
-            for (String channel : channelNames) {
-                SysDictCompany orderChanne = orderChannelMap.get(channel);
+            for (String sales : salesNames) {
+                SysDictCompany saleOne = salesMap.get(sales);
                 for (String small : smallNames) {
                     OrderSmallType orderSmallType = orderSmallTypeMap.get(small);
                     for (String category : categoryNames) {
                         GoodsCategory goodsCategory = categoryMap1.get(category);
-                        for (String source : sourceNames) {
-
-                            SysDictCompany orderSource = orderSourceMap.get(source);
 
                             WebsitDispatch websitDispatch = new WebsitDispatch();
                             websitDispatch.setWebsitId(adminWebsit.getWebsitId());
@@ -556,23 +540,21 @@ public class ChangeOrderLogic {
                             websitDispatch.setCategoryId(goodsCategory.getCategoryId());
                             websitDispatch.setCategoryName(goodsCategory.getName());
 
-                            websitDispatch.setDictCode(orderChanne.getDictCode());
-                            websitDispatch.setDictValue(orderChanne.getDictValue());
+                            websitDispatch.setSaleTypeName(saleOne.getDictCode());
+                            websitDispatch.setSaleTypeId(saleOne.getDictValue());
 
-                            websitDispatch.setOrderSource(orderSource.getDictValue());
-                            websitDispatch.setOrderSourceId(orderSource.getDictCode());
 
-                            if (websitDispatchService.lambdaQuery().eq(WebsitDispatch::getStreetCode,region.getId())
-                                    .eq(WebsitDispatch::getOrderSmallId,websitDispatch.getOrderSmallId())
-                                    .eq(WebsitDispatch::getCategoryId,websitDispatch.getCategoryId())
-                                    .eq(WebsitDispatch::getDictCode,websitDispatch.getDictCode())
-                                    .eq(WebsitDispatch::getOrderSourceId,websitDispatch.getOrderSourceId()).count() > 0) {
-                                throw new RemoteServiceException("存在街道："+websitDispatch.getStreetName()+"，产品大类："+websitDispatch.getCategoryName()+
-                                        "，工单渠道："+websitDispatch.getDictValue()+"，工单来源："+websitDispatch.getOrderSource()+"，工单类型："+websitDispatch.getOrderSmallTypeText());
+                            if (websitDispatchService.lambdaQuery().eq(WebsitDispatch::getStreetCode, region.getId())
+                                    .eq(WebsitDispatch::getOrderSmallId, websitDispatch.getOrderSmallId())
+                                    .eq(WebsitDispatch::getCategoryId, websitDispatch.getCategoryId())
+                                    .eq(WebsitDispatch::getSaleTypeId, websitDispatch.getSaleTypeId())
+                                    .count() > 0) {
+                                throw new RemoteServiceException("存在街道：" + websitDispatch.getStreetName() + "，产品大类：" + websitDispatch.getCategoryName() +
+                                        "，承接渠道：" + websitDispatch.getSaleTypeName() + "，工单类型：" + websitDispatch.getOrderSmallTypeText());
                             }
 
                             websitDispatches.add(websitDispatch);
-                        }
+
                     }
                 }
             }
@@ -587,14 +569,14 @@ public class ChangeOrderLogic {
     @Transactional(rollbackFor = Exception.class)
     public void updateDispatch(WebsitDispatch websitDispatch) {
 
-        if (websitDispatchService.lambdaQuery().eq(WebsitDispatch::getStreetCode,websitDispatch.getStreetCode())
-                .eq(WebsitDispatch::getOrderSmallId,websitDispatch.getOrderSmallId())
-                .eq(WebsitDispatch::getCategoryId,websitDispatch.getCategoryId())
-                .eq(WebsitDispatch::getDictCode,websitDispatch.getDictCode())
-                .ne(WebsitDispatch::getId,websitDispatch.getId())
-                .eq(WebsitDispatch::getOrderSourceId,websitDispatch.getOrderSourceId()).count() > 0) {
-            throw new RemoteServiceException("存在街道："+websitDispatch.getStreetName()+"，产品大类："+websitDispatch.getCategoryName()+
-                    "，工单渠道："+websitDispatch.getDictValue()+"，工单来源："+websitDispatch.getOrderSource()+"，工单类型："+websitDispatch.getOrderSmallTypeText());
+        if (websitDispatchService.lambdaQuery().eq(WebsitDispatch::getStreetCode, websitDispatch.getStreetCode())
+                .eq(WebsitDispatch::getOrderSmallId, websitDispatch.getOrderSmallId())
+                .eq(WebsitDispatch::getCategoryId, websitDispatch.getCategoryId())
+                .eq(WebsitDispatch::getSaleTypeId, websitDispatch.getSaleTypeId())
+                .ne(WebsitDispatch::getId, websitDispatch.getId())
+                .count() > 0) {
+            throw new RemoteServiceException("存在街道：" + websitDispatch.getStreetName() + "，产品大类：" + websitDispatch.getCategoryName() +
+                    "，承接渠道：" + websitDispatch.getSaleTypeName()  + "，工单类型：" + websitDispatch.getOrderSmallTypeText());
         }
 
         websitDispatch.updateById();

mall-server-api/src/main/java/com/gree/mall/manager/utils/http/HttpUtils.java

@@ -81,7 +81,7 @@ public class HttpUtils {
 
     }
 
-    static public String requestPostBody(String url, String json, Map<String, String> heads) {
+    static public Response requestPostBody(String url, String json, Map<String, String> heads) {
 
 //        OkHttpClient okHttpClient = new OkHttpClient();
 
@@ -101,7 +101,7 @@ public class HttpUtils {
             Response response = okHttpClient.newCall(req).execute();
 
             if (response.isSuccessful()) {
-                return response.body().string();
+                return response;
                 //打印服务端返回结果
             }
         } catch (Exception e) {

mall-server-api/src/main/resources/bootstrap-test.properties

@@ -8,7 +8,7 @@ express.callback=${sys.url}/${server.servlet.context-path}/common/express/callba
 
 #定时器
 schedule.enable=true
-schedule.gongdan.enable=true
+schedule.gongdan.enable=false
 #分销商城商品接口
 gjmall.goods.url=http://121.43.111.127:10003/goods/outside/list
 
@@ -118,15 +118,12 @@ fadada.websit.auth.verified-way=3
 fadada.websit.auth.notify.url=${sys.url}/${server.servlet.context-path}/fdd/notify/websit/auth
 fadada.websit.sign.notify.url=${sys.url}/${server.servlet.context-path}/fdd/notify/websit/batch/sign
 fadada.websit.person.auth.notify.url=${sys.url}/${server.servlet.context-path}/fdd/notify/websit/person
-gree.url=https://sms.gree.com/api/sso/sms-server-order-external
-
-
-gree.four.url=http://sms.gree.com/api/sso/sms-server-order-external
+gree.four.url=http://api.sms-test.gree.com/api/sso/sms-server-order-external
 
 
 #总部3.0接口地址
 gree.V3.url=https://api-sms.gree.com
-gree.V3.gettoken=https://sms.gree.com/api/pub/nts-foundation-flycloud-user/api/v1/openid-connect/token
+gree.V3.gettoken=http://api.sms-test.gree.com/api/pub/nts-foundation-flycloud-user/api/v1/openid-connect/token
 gree.client.id=guangfoserver
 gree.V3.client.secert=f81f5ac8-ad24-4212-9b2d-9cc78f982562
 gree.V3.api.url=${gree.V3.url}/api/sso/autoapp-default-server-greeshmobile/api/yunpaigong/accessories

mall-server-api/src/main/resources/mapper/workorder/IncreMapper.xml

@@ -29,28 +29,19 @@
         a.area_code,
         a.name as streetName,
         a.id as streetCode,
-        b.dict_value,
-        b.dict_code,
         c.order_small_type_text,
         c.id as orderSmallId,
         d.name as categoryName,
         d.category_id,
-        e.dict_value as order_source,
-        e.dict_code as order_source_id
+        e.dict_value as saleTypeName,
+        e.dict_code as saleTypeId
         FROM
         region a
-        join sys_dict_company b on b.dict_type = 'ORDER_CHANNEL' and b.del = 0     and
+        join order_small_type c on
         a.city_name IN ( '广州市', '清远市', '韶关市', '佛山市', '肇庆市', '云浮市' )
         AND a.`level` = 4
         <if test="adminCompanyIds != null and adminCompanyIds.size > 0">
-            AND b.company_wechat_id IN
-            <foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-        </if>
-        join order_small_type c
-        <if test="adminCompanyIds != null and adminCompanyIds.size > 0">
-            on c.company_wechat_id IN
+            AND c.company_wechat_id IN
             <foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
                 #{item}
             </foreach>
@@ -62,7 +53,7 @@
                 #{item}
             </foreach>
         </if>
-        join sys_dict_company e on e.dict_type = 'WORKER_ORDER_SOURCE' and e.del = 0
+        join sys_dict_company e on e.dict_type = 'SALES_TYPE' and e.del = 0
         <if test="adminCompanyIds != null and adminCompanyIds.size > 0">
             AND e.company_wechat_id IN
             <foreach item="item" index="index" collection="adminCompanyIds" open="(" separator="," close=")">
@@ -72,7 +63,7 @@
         ${ex.query}
 
         <if test="codeList != null and codeList.size > 0">
-            AND CONCAT(a.id,b.dict_code,c.id,d.category_id,e.dict_code) not In
+            AND CONCAT(a.id,e.dict_code,c.id,d.category_id) not In
             <foreach item="item" index="index" collection="codeList" open="(" separator="," close=")">
                 #{item}
             </foreach>

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/ManuelController.java

@@ -1,109 +0,0 @@
-package com.gree.mall.manager.controller;
-
-import com.github.binarywang.wxpay.exception.WxPayException;
-import com.gree.mall.manager.bean.Freight.FreightTemplateBean;
-import com.gree.mall.manager.enums.ExchangeCodeTypeEnum;
-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.WechatLogic;
-import com.gree.mall.manager.plus.entity.GiftExchangeCode;
-import com.gree.mall.manager.plus.service.GiftExchangeCodeService;
-import com.gree.mall.manager.utils.RC4Utils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.math.BigDecimal;
-import java.util.*;
-
-@Slf4j
-@RestController
-@Api(value = "手动操作接口", tags ={"手动操作接口"} )
-@RequestMapping(value = "/manuel", produces = "application/json; charset=utf-8")
-public class ManuelController {
-    @Autowired
-    private ExpressLogic expressLogic;
-    @Autowired
-    private WechatLogic wechatLogic;
-    @Autowired
-    GiftExchangeCodeService giftExchangeCodeService;
-
-    @PostMapping("/excode/init")
-    public void initExcode(){
-        int count = giftExchangeCodeService.count();
-        if(count > 0){
-            return;
-        }
-        List<GiftExchangeCode> list = new ArrayList<>();
-        for(int i = 0 ;i < 3000;i++){
-            String s = RC4Utils.encry_RC4_string(String.format("%04d", 1), UUID.randomUUID().toString());
-            GiftExchangeCode giftExchangeCode = new GiftExchangeCode();
-            giftExchangeCode.setId(s);
-            giftExchangeCode.setStatus(0);
-            giftExchangeCode.setCreateTime(new Date());
-            if(i >= 2000) {
-                giftExchangeCode.setAmount(BigDecimal.valueOf(9.9));
-            }
-            list.add(giftExchangeCode);
-        }
-        giftExchangeCodeService.saveBatch(list);
-    }
-
-    @PostMapping("/excode/init2")
-    public void initExcode2(
-            @ApiParam("生成的数量") @RequestParam Integer num
-    ){
-        int count = giftExchangeCodeService.count();
-        if(count > 0){
-            return;
-        }
-        Set<String> codes = new HashSet<>();
-        List<GiftExchangeCode> list = new ArrayList<>();
-        for(int i = 0 ;i < num;i++){
-            String s = RC4Utils.encry_RC4_string(String.format("%04d", 1), UUID.randomUUID().toString());
-            codes.add(s);
-        }
-        for(String s : codes) {
-            GiftExchangeCode giftExchangeCode = new GiftExchangeCode();
-            giftExchangeCode.setId(s);
-            giftExchangeCode.setStatus(0);
-            giftExchangeCode.setType(ExchangeCodeTypeEnum.SUB.toString());
-            giftExchangeCode.setCreateTime(new Date());
-            giftExchangeCode.setAmount(new BigDecimal(9999999));
-            giftExchangeCode.setRemark("金额抵扣");
-            list.add(giftExchangeCode);
-        }
-        giftExchangeCodeService.saveBatch(list);
-    }
-
-//
-//    @PostMapping("/express/subscribe")
-//    @ApiOperation(value = "快递订阅")
-//    public ResponseHelper subscribe(
-//            @ApiParam(value = "快递单号",required = true) @RequestParam(required = true)String logisticsNo,
-//            @ApiParam(value = "快递公司代码",required = true) @RequestParam(required = true)String company
-//    ){
-//        expressLogic.subscribeExpressPrd(logisticsNo,company);
-//        return ResponseHelper.success();
-//    }
-//
-//
-//    @PostMapping("/pay/refund")
-//    @ApiOperation(value = "手动退款")
-//    public ResponseHelper refund(
-//            @ApiParam(value = "订单号",required = true) @RequestParam(required = true)String orderId,
-//            @ApiParam(value = "退款单号",required = true) @RequestParam(required = true)String refundNo,
-//            @ApiParam(value = "收款总金额",required = true) @RequestParam(required = true)Double totalFee,
-//            @ApiParam(value = "退款金额",required = true) @RequestParam(required = true)Double refundFee
-//    ) throws RemoteServiceException, WxPayException {
-//        wechatLogic.refund(orderId,refundNo,totalFee,refundFee);
-//        return ResponseHelper.success();
-//    }
-
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/activity/PromotionActivityController.java

@@ -1,86 +0,0 @@
-package com.gree.mall.manager.controller.activity;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.ExcelData;
-import com.gree.mall.manager.bean.activity.PromotionActivityBatchBean;
-import com.gree.mall.manager.bean.activity.PromotionActivityBean;
-import com.gree.mall.manager.bean.activity.PromotionActivityVO;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.activity.PromotionActivityLogic;
-import com.gree.mall.manager.utils.excel.ExcelUtils;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-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 javax.servlet.http.HttpServletResponse;
-import java.util.Date;
-
-@Slf4j
-@RestController
-@Api(value = "扫码活动单API", tags ={"扫码活动单API"} )
-@RequestMapping(value = "/promotion/activity", produces = "application/json; charset=utf-8")
-public class PromotionActivityController {
-
-    @Resource
-    PromotionActivityLogic promotionActivityLogic;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "活动单-列表")
-    public ResponseHelper<IPage<PromotionActivityVO>> list(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<PromotionActivityVO> page = promotionActivityLogic.list(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<PromotionActivityVO>() {});
-    }
-
-    @GetMapping("/export")
-    @ApiOperation(value = "活动单-导出")
-    public void export(
-            @ApiParam(value = "开始时间") @RequestParam Date statDate,
-            @ApiParam(value = "结束时间") @RequestParam Date endDate,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-
-        ExcelData excelData = promotionActivityLogic.export(statDate, endDate);
-
-        ExcelUtils.exportExcel(request,response,"活动单列表.xlsx",excelData);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "活动单-详情")
-    public ResponseHelper<PromotionActivityBean> detail(
-            @ApiParam(value = "id", required = true) @RequestParam String promotionActivityId
-    ) throws RemoteServiceException {
-        PromotionActivityBean bean = promotionActivityLogic.detail(promotionActivityId);
-        return ResponseHelper.success(bean);
-    }
-
-    @PostMapping("/add")
-    @ApiOperation(value = "活动单-新增")
-    public ResponseHelper add(
-            HttpServletRequest request,
-            @RequestBody PromotionActivityBean bean
-    ) throws Exception {
-        promotionActivityLogic.add(request, bean);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/batch/follow")
-    @ApiOperation(value = "活动单-批量跟进")
-    public ResponseHelper batchFollow(
-            @RequestBody PromotionActivityBatchBean bean
-    ) throws Exception {
-        promotionActivityLogic.batchFollow(bean);
-        return ResponseHelper.success();
-    }
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/activity/PromotionApplyController.java

@@ -1,70 +0,0 @@
-//package com.gree.mall.manager.controller.activity;
-//
-//import com.baomidou.mybatisplus.core.metadata.IPage;
-//import com.gree.mall.manager.bean.activity.PromotionApplyBean;
-//import com.gree.mall.manager.helper.ResponseHelper;
-//import com.gree.mall.manager.logic.activity.PromotionApplyLogic;
-//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 java.math.BigDecimal;
-//
-//@Slf4j
-//@RestController
-//@Api(value = "优惠申请API", tags ={"优惠申请API"} )
-//@RequestMapping(value = "/promotion/apply", produces = "application/json; charset=utf-8")
-//public class PromotionApplyController {
-//
-//    @Autowired
-//    PromotionApplyLogic promotionApplyLogic;
-//
-//
-//    @GetMapping("/list")
-//    @ApiOperation(value = "列表")
-//    public ResponseHelper<IPage<PromotionApplyBean>> page(
-//            @ApiParam(value = "昵称手机号",required = true) @RequestParam String nickName,
-//            @ApiParam(value = "网点名称",required = true) @RequestParam String websitName,
-//            @ApiParam(value = "页号",required = true) @RequestParam Integer pageNum,
-//            @ApiParam(value = "页大小",required = true) @RequestParam Integer pageSize,
-//            HttpServletRequest request
-//    ) throws Exception {
-//        IPage<PromotionApplyBean> list = promotionApplyLogic.list(nickName, websitName, pageNum, pageSize);
-//        return ResponseHelper.success(list);
-//    }
-//
-//    @GetMapping("/detail")
-//    @ApiOperation(value = "详情")
-//    public ResponseHelper<PromotionApplyBean> detail(
-//            @ApiParam(value = "id") @RequestParam(required = true)String id
-//    ) throws Exception {
-//        PromotionApplyBean detail = promotionApplyLogic.detail(id);
-//        return ResponseHelper.success(detail);
-//    }
-//
-//
-//    @PostMapping("/save")
-//    @ApiOperation(value = "保存")
-//    public ResponseHelper save(
-//            @ApiParam(value = "id(不传就新增，传了就修改)",required = true) @RequestParam(required = false) String id,
-//            @ApiParam(value = "用户id",required = true) @RequestParam String userId,
-//            @ApiParam(value = "折扣率",required = true) @RequestParam BigDecimal rate,
-//            @ApiParam(value = "true=启用 false=禁用",required = true) @RequestParam Boolean status
-//    ) throws Exception {
-//        promotionApplyLogic.save(id,userId,rate,status);
-//        return ResponseHelper.success();
-//    }
-//
-//    @PostMapping("/delete")
-//    @ApiOperation(value = "删除")
-//    public ResponseHelper delete(
-//            @ApiParam(value = "id") @RequestParam(required = true)String id
-//    ) throws Exception {
-//        promotionApplyLogic.delete(id);
-//        return ResponseHelper.success();
-//    }
-//}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/activity/PromotionDiscountController.java

@@ -1,78 +0,0 @@
-package com.gree.mall.manager.controller.activity;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.bean.activity.PromotionGroupBean;
-import com.gree.mall.manager.bean.activity.PromotionGroupList;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.activity.PromotionDiscountLogic;
-import com.gree.mall.manager.plus.entity.PromotionDiscount;
-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 java.util.Map;
-
-@Slf4j
-@RestController
-@Api(value = "折扣活动API", tags ={"折扣活动API"} )
-@RequestMapping(value = "/promotion/discount", produces = "application/json; charset=utf-8")
-public class PromotionDiscountController {
-
-    @Autowired
-    PromotionDiscountLogic promotionDiscountLogic;
-
-
-    @GetMapping("/list")
-    @ApiOperation(value = "折扣活动-列表")
-    public ResponseHelper<IPage<PromotionDiscount>> page(
-            @ApiParam(value = "页号",required = true) @RequestParam Integer pageNum,
-            @ApiParam(value = "页大小",required = true) @RequestParam Integer pageSize,
-            HttpServletRequest request
-    ) throws Exception {
-        IPage<PromotionDiscount> list = promotionDiscountLogic.list(pageNum, pageSize);
-        return ResponseHelper.success(list);
-    }
-
-    @GetMapping("/detail")
-    @ApiOperation(value = "折扣活动-详情")
-    public ResponseHelper<PromotionDiscount> detail(
-            @ApiParam(value = "id") @RequestParam(required = true)String id
-    ) throws Exception {
-        PromotionDiscount detail = promotionDiscountLogic.detail(id);
-        return ResponseHelper.success(detail);
-    }
-
-
-    @PostMapping("/add")
-    @ApiOperation(value = "折扣活动-新增")
-    public ResponseHelper add(
-            @ApiParam(value = "object") @RequestBody(required = true)PromotionDiscount promotionDiscount
-    ) throws Exception {
-        promotionDiscountLogic.add(promotionDiscount);
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("/update")
-    @ApiOperation(value = "折扣活动-修改")
-    public ResponseHelper update(
-            @ApiParam(value = "object") @RequestBody(required = false)PromotionDiscount promotionDiscount
-    ) throws Exception {
-        promotionDiscountLogic.update(promotionDiscount);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/delete")
-    @ApiOperation(value = "折扣活动-删除")
-    public ResponseHelper delete(
-            @ApiParam(value = "id") @RequestParam(required = true)String id
-    ) throws Exception {
-        promotionDiscountLogic.delete(id);
-        return ResponseHelper.success();
-    }
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/activity/PromotionFullPieceController.java

@@ -1,76 +0,0 @@
-package com.gree.mall.manager.controller.activity;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.bean.activity.fullpiece.PromotionFullPieceBean;
-import com.gree.mall.manager.bean.activity.fullpiece.PromotionFullPieceListVO;
-import com.gree.mall.manager.bean.activity.fullpiece.PromotionFullPieceOrderVO;
-import com.gree.mall.manager.bean.activity.fullpiece.PromotionFullPieceVO;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.activity.PromotionFullPieceLogic;
-import com.gree.mall.manager.plus.entity.OrderDetail;
-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 java.util.Map;
-
-@Slf4j
-@RestController
-@Api(value = "满件打折活动", tags ={"满件打折活动"} )
-@RequestMapping(value = "/promotion/full/piece", produces = "application/json; charset=utf-8")
-public class PromotionFullPieceController {
-
-    @Autowired
-    PromotionFullPieceLogic promotionFullPieceLogic;
-
-    @GetMapping("/list")
-    @ApiOperation("列表")
-    public ResponseHelper<PromotionFullPieceListVO> list(
-            @ApiParam(value = "1=进行中 2=未开始 3=已过期") @RequestParam(required = false)Integer status,
-            @RequestParam Integer pageNum,
-            @RequestParam Integer pageSize){
-        IPage<PromotionFullPieceListVO> list = promotionFullPieceLogic.list(status,pageNum, pageSize);
-        return ResponseHelper.success(list);
-    }
-
-    @GetMapping("/total")
-    @ApiOperation("根据状态统计活动数量")
-    public ResponseHelper<Map<String, Integer>> totalByStatus(){
-        Map<String, Integer> map = promotionFullPieceLogic.totalByStatus();
-        return ResponseHelper.success(map);
-    }
-
-    @PostMapping("/save")
-    @ApiOperation(value = "保存活动(有id修改，没id新增)")
-    public ResponseHelper save(
-            @ApiParam(value = "object") @RequestBody(required = false) PromotionFullPieceBean bean
-    ) throws Exception {
-        promotionFullPieceLogic.save(bean);
-        return ResponseHelper.success();
-    }
-
-    //PromotionFullPieceVO
-    @GetMapping("/detail")
-    @ApiOperation(value = "活动详情")
-    public ResponseHelper<PromotionFullPieceVO> detail(
-            @ApiParam(value = "id") @RequestParam String id
-    ) throws Exception {
-        PromotionFullPieceVO detail = promotionFullPieceLogic.detail(id);
-        return ResponseHelper.success(detail);
-    }
-
-    @GetMapping("/order/detail")
-    @ApiOperation("订单详情")
-    public ResponseHelper<IPage<OrderDetail>> orderDetail(
-            @ApiParam(value = "活动id") @RequestParam String id,
-            @RequestParam Integer pageNum,
-            @RequestParam Integer pageSize
-    ){
-        IPage<PromotionFullPieceOrderVO> page = promotionFullPieceLogic.orderDetail(id, pageNum, pageSize);
-        return ResponseHelper.success(page);
-    }
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/activity/PromotionGroupController.java

@@ -1,160 +0,0 @@
-package com.gree.mall.manager.controller.activity;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.activity.PromotionGroupBean;
-import com.gree.mall.manager.bean.activity.PromotionGroupDetail;
-import com.gree.mall.manager.bean.activity.PromotionGroupList;
-import com.gree.mall.manager.bean.goods.PromotionGroupListVO;
-import com.gree.mall.manager.bean.order.OrderShareVO;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.activity.PromotionGroupLogic;
-import com.gree.mall.manager.plus.entity.GoodsVisit;
-import com.gree.mall.manager.plus.entity.OrderInfo;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-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.util.Map;
-
-@Slf4j
-@RestController
-@Api(value = "团购活动管理", tags ={"团购活动管理"} )
-@RequestMapping(value = "/promotion/group", produces = "application/json; charset=utf-8")
-public class PromotionGroupController {
-
-    @Autowired
-    PromotionGroupLogic promotionGroupLogic;
-
-    @ZfireList
-    @PostMapping("/list/pageV2")
-    @ApiOperation(value = "团购活动列表V2")
-    public ResponseHelper<IPage<PromotionGroupListVO>> pageV2(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<PromotionGroupListVO> page = promotionGroupLogic.pageV2(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<PromotionGroupListVO>() {});
-    }
-
-    @PostMapping("/pageExport")
-    @ApiOperation(value = "团购活动列表V2导出")
-    public void listExport(@RequestBody ZfireParamBean zfireParamBean, HttpServletRequest request, HttpServletResponse response) throws Exception {
-        //1.组装查询条件
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
-        //2.查询要导出的内容
-        IPage<PromotionGroupListVO> page = promotionGroupLogic.pageV2(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(page.getRecords(), zfireParam.getExportFields(), request, response);
-    }
-
-
-
-    @GetMapping("/list")
-    @ApiOperation(value = "团购活动列表")
-    public ResponseHelper page(
-            @ApiParam(value = "状态 true:开启 false:关闭") @RequestParam(required = false) Boolean status,
-            @ApiParam(value = "页号",required = true) @RequestParam Integer pageNum,
-            @ApiParam(value = "页大小",required = true) @RequestParam Integer pageSize,
-            HttpServletRequest request
-    ) throws Exception {
-        IPage<PromotionGroupList> list = promotionGroupLogic.list(status, pageNum, pageSize,request);
-        return ResponseHelper.success(list);
-    }
-
-    @GetMapping("/detail")
-    @ApiOperation(value = "团购活动详情")
-    public ResponseHelper<PromotionGroupBean> detail(
-            @ApiParam(value = "promotionGroupId") @RequestParam(required = true)String promotionGroupId
-    ) throws Exception {
-        PromotionGroupBean detail = promotionGroupLogic.detail(promotionGroupId);
-        return ResponseHelper.success(detail);
-    }
-
-    @GetMapping("/count")
-    @ApiOperation(value = "团购分类统计")
-    public ResponseHelper count(
-            HttpServletRequest request
-    ) throws Exception {
-        Map<String, Integer> count = promotionGroupLogic.count(request);
-        return ResponseHelper.success(count);
-    }
-
-
-    @PostMapping("/add")
-    @ApiOperation(value = "新增团购活动")
-    public ResponseHelper<String> add(
-            @ApiParam(value = "object") @RequestBody(required = false)PromotionGroupBean promotionGroupBean,
-            HttpServletRequest request
-            ) throws Exception {
-        String promotionGroupId = promotionGroupLogic.add(promotionGroupBean,request);
-        return ResponseHelper.success(promotionGroupId);
-    }
-
-
-    @PostMapping("/update")
-    @ApiOperation(value = "修改团购活动")
-    public ResponseHelper update(
-            HttpServletRequest request,
-            @ApiParam(value = "object") @RequestBody(required = false)PromotionGroupBean promotionGroupBean
-    ) throws Exception {
-        promotionGroupLogic.update(request,promotionGroupBean);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/status/update")
-    @ApiOperation(value = "修改团购状态")
-    public ResponseHelper updateStatus(
-            @ApiParam(value = "id") @RequestParam(required = false) String promotionGroupId,
-            @ApiParam(value = "状态 true:开启 false:关闭") @RequestParam(required = false) Boolean status
-    ) throws Exception {
-        promotionGroupLogic.updateStatus(promotionGroupId,status);
-        return ResponseHelper.success();
-    }
-
-
-    @GetMapping("/pt/detail")
-    @ApiOperation(value = "拼团详情列表")
-    public ResponseHelper<IPage<PromotionGroupDetail>> ptDetail(
-            @ApiParam(value = "promotionGroupId") @RequestParam(required = false) String promotionGroupId,
-            @ApiParam(value = "团长手机号",required = false) @RequestParam(required = false) String mobile,
-            @ApiParam(value = "pageNum") @RequestParam(required = true)Integer pageNum,
-            @ApiParam(value = "pageSize") @RequestParam(required = true)Integer pageSize
-    ) throws Exception {
-        IPage<PromotionGroupDetail> promotionGroupDetailIPage = promotionGroupLogic.ptDetail(promotionGroupId,mobile,pageNum, pageSize);
-        return ResponseHelper.success(promotionGroupDetailIPage);
-    }
-
-    @GetMapping("/pt/orderlist")
-    @ApiOperation(value = "拼团订单列表")
-    public ResponseHelper<IPage<OrderInfo>> ptOrderlist(
-            @ApiParam(value = "promotionGroupId") @RequestParam(required = false) String promotionGroupId,
-            @ApiParam(value = "用户id") @RequestParam(required = true)String userId,
-            @ApiParam(value = "pageNum") @RequestParam(required = true)Integer pageNum,
-            @ApiParam(value = "pageSize") @RequestParam(required = true)Integer pageSize
-    ) throws Exception {
-        IPage<OrderInfo> orderInfoIPage = promotionGroupLogic.queryOrderList(promotionGroupId,userId, pageNum, pageSize);
-        return ResponseHelper.success(orderInfoIPage);
-    }
-
-    @GetMapping("/pt/visitlist")
-    @ApiOperation(value = "拼团订单列表")
-    public ResponseHelper<IPage<GoodsVisit>> ptVisitlist(
-            @ApiParam(value = "promotionGroupId") @RequestParam(required = false) String promotionGroupId,
-            @ApiParam(value = "用户id") @RequestParam(required = true)String userId,
-            @ApiParam(value = "pageNum") @RequestParam(required = true)Integer pageNum,
-            @ApiParam(value = "pageSize") @RequestParam(required = true)Integer pageSize,
-            HttpServletRequest request
-    ) throws Exception {
-        IPage<GoodsVisit> goodsVisitIPage = promotionGroupLogic.queryGoodsVisit(promotionGroupId,userId, pageNum, pageSize, request);
-        return ResponseHelper.success(goodsVisitIPage);
-    }
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/activity/PromotionGroupUserController.java

@@ -1,53 +0,0 @@
-package com.gree.mall.manager.controller.activity;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.bean.activity.PromotionGroupBean;
-import com.gree.mall.manager.bean.activity.PromotionGroupList;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.activity.PromotionGroupLogic;
-import com.gree.mall.manager.logic.activity.PromotionGroupUserLogic;
-import com.gree.mall.manager.plus.entity.PromotionGroupSpecUser;
-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 java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-@Slf4j
-@RestController
-@Api(value = "团购团长管理", tags ={"团购团长管理"} )
-@RequestMapping(value = "/promotion/user", produces = "application/json; charset=utf-8")
-public class PromotionGroupUserController {
-
-    @Autowired
-    PromotionGroupUserLogic promotionGroupUserLogic;
-
-    @GetMapping("/list")
-    @ApiOperation(value = "团购活动列表")
-    public ResponseHelper page(
-            @ApiParam(value = "团购商品规格id") @RequestParam(required = false) String promotionGroupSpecId,
-            @ApiParam(value = "名称") @RequestParam(required = false) String name,
-            @ApiParam(value = "手机号") @RequestParam(required = false) String phone,
-            @ApiParam(value = "团购价") @RequestParam(required = false) BigDecimal groupPrice,
-            @ApiParam(value = "分享金额") @RequestParam(required = false) BigDecimal shareAmount
-    ) throws Exception {
-        List<PromotionGroupSpecUser> list = promotionGroupUserLogic.list(promotionGroupSpecId, name, phone, groupPrice, shareAmount);
-        return ResponseHelper.success(list);
-    }
-
-    @PostMapping("/update")
-    @ApiOperation(value = "修改团购价")
-    public ResponseHelper update(
-            @RequestBody List<PromotionGroupSpecUser> specUserList
-    ) throws Exception {
-        promotionGroupUserLogic.update(specUserList);
-        return ResponseHelper.success(specUserList);
-    }
-
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/activity/PromotionLuckDrawController.java

@@ -1,129 +0,0 @@
-package com.gree.mall.manager.controller.activity;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.bean.ExcelData;
-import com.gree.mall.manager.bean.activity.luckdraw.PromotionLuckDrawBean;
-import com.gree.mall.manager.bean.activity.luckdraw.PromotionLuckDrawCodeBean;
-import com.gree.mall.manager.bean.activity.luckdraw.PromotionLuckDrawList;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.activity.PromotionLuckDrawLogic;
-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 javax.validation.Valid;
-
-@Slf4j
-@RestController
-@Api(value = "抽奖活动API", tags ={"抽奖活动API"} )
-@RequestMapping(value = "/promotion/luck/draw", produces = "application/json; charset=utf-8")
-public class PromotionLuckDrawController {
-
-    @Autowired
-    PromotionLuckDrawLogic promotionLuckDrawLogic;
-
-    @GetMapping("/list")
-    @ApiOperation("抽奖活动列表")
-    public ResponseHelper<IPage<PromotionLuckDrawList>> list(
-         @ApiParam(value = "活动名称",required = false) @RequestParam(required = false) String name,
-         @ApiParam(value = "状态",required = false) @RequestParam(required = false) Boolean status,
-         @ApiParam(value = "页号",required = true) @RequestParam(required = true) Integer pageNum,
-         @ApiParam(value = "页大小",required = true) @RequestParam(required = true) Integer pageSize
-    ){
-        IPage<PromotionLuckDrawList> list = promotionLuckDrawLogic.list(name, status, pageNum, pageSize);
-        return ResponseHelper.success(list);
-    }
-
-    @PostMapping("/add")
-    @ApiOperation("新增抽奖活动")
-    public ResponseHelper add( @Valid @RequestBody PromotionLuckDrawBean promotionLuckDrawBean){
-        promotionLuckDrawLogic.add(promotionLuckDrawBean);
-        return ResponseHelper.success();
-    }
-
-    @GetMapping("/detail")
-    @ApiOperation(value = "抽奖活动详情")
-    public ResponseHelper<PromotionLuckDrawBean> detail(
-            @ApiParam(value = "抽奖活动id",required = true) @RequestParam(required = true) String promotionLuckDrawId
-    ) throws Exception {
-        PromotionLuckDrawBean detail = promotionLuckDrawLogic.detail(promotionLuckDrawId);
-        return ResponseHelper.success(detail);
-    }
-
-    @PostMapping("/updateStatus")
-    @ApiOperation("修改状态")
-    public ResponseHelper updateStatus(
-            @ApiParam(value = "抽奖活动id",required = true) @RequestParam(required = true) String promotionLuckDrawId,
-            @ApiParam(value = "状态true=进行中 false=已结束",required = true) @RequestParam(required = true) Boolean status
-    ){
-        promotionLuckDrawLogic.updateStatus(promotionLuckDrawId,status);
-        return ResponseHelper.success();
-    }
-
-
-    @GetMapping("/exchange/list")
-    @ApiOperation("兑换记录")
-    public ResponseHelper<IPage<PromotionLuckDrawCodeBean>> exchangeList(
-            @ApiParam(value = "活动id",required = false) @RequestParam(required = false) String promotionLuckDrawId,
-            @ApiParam(value = "优惠券id",required = false) @RequestParam(required = false) String promotionLuckDrawCouponId,
-            @ApiParam(value = "兑换码",required = false) @RequestParam(required = false) String code,
-            @ApiParam(value = "昵称",required = false) @RequestParam(required = false) String name,
-            @ApiParam(value = "电话",required = false) @RequestParam(required = false) String mobile,
-            @ApiParam(value = "兑换开始时间",required = false) @RequestParam(required = false) String exchangeStartTime,
-            @ApiParam(value = "兑换结束时间",required = false) @RequestParam(required = false) String exchangeEndTime,
-            @ApiParam(value = "使用开始时间",required = false) @RequestParam(required = false) String useStartTime,
-            @ApiParam(value = "使用结束时间",required = false) @RequestParam(required = false) String useEndTime,
-            @ApiParam(value = "订单id",required = false) @RequestParam(required = false) String orderId,
-            @ApiParam(value = "优惠券名称",required = false) @RequestParam(required = false) String couponName,
-            @ApiParam(value = "状态 0=未兑换 1=已兑换未使用 2=已使用",required = false) @RequestParam(required = false) Integer status2,
-            @ApiParam(value = "页号",required = true) @RequestParam(required = true) Integer pageNum,
-            @ApiParam(value = "页大小",required = true) @RequestParam(required = true) Integer pageSize
-    ){
-        IPage<PromotionLuckDrawCodeBean> page = promotionLuckDrawLogic
-                .exchangeList(promotionLuckDrawId,promotionLuckDrawCouponId, code, name, mobile, exchangeStartTime, exchangeEndTime, useStartTime,
-                        useEndTime, orderId, couponName, status2, pageNum, pageSize);
-        return ResponseHelper.success(page);
-    }
-
-    @GetMapping("/exchange/export")
-    @ApiOperation("兑换记录")
-    public void exportExchange(
-            @ApiParam(value = "活动id",required = false) @RequestParam(required = false) String promotionLuckDrawId,
-            @ApiParam(value = "优惠券id",required = false) @RequestParam(required = false) String promotionLuckDrawCouponId,
-            @ApiParam(value = "兑换码",required = false) @RequestParam(required = false) String code,
-            @ApiParam(value = "昵称",required = false) @RequestParam(required = false) String name,
-            @ApiParam(value = "电话",required = false) @RequestParam(required = false) String mobile,
-            @ApiParam(value = "兑换开始时间",required = false) @RequestParam(required = false) String exchangeStartTime,
-            @ApiParam(value = "兑换结束时间",required = false) @RequestParam(required = false) String exchangeEndTime,
-            @ApiParam(value = "使用开始时间",required = false) @RequestParam(required = false) String useStartTime,
-            @ApiParam(value = "使用结束时间",required = false) @RequestParam(required = false) String useEndTime,
-            @ApiParam(value = "订单id",required = false) @RequestParam(required = false) String orderId,
-            @ApiParam(value = "优惠券名称",required = false) @RequestParam(required = false) String couponName,
-            @ApiParam(value = "状态 0=未兑换 1=已兑换未使用 2=已使用",required = false) @RequestParam(required = false) Integer status2,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        IPage<PromotionLuckDrawCodeBean> page = promotionLuckDrawLogic
-                .exchangeList(promotionLuckDrawId,promotionLuckDrawCouponId, code, name, mobile, exchangeStartTime, exchangeEndTime, useStartTime,
-                        useEndTime, orderId, couponName, status2, 1, -1);
-        ExcelData excelData = promotionLuckDrawLogic.exportData(page.getRecords());
-        ExcelUtils.exportExcel(request,response,"兑换记录.xlsx",excelData);
-    }
-
-    @GetMapping("/code/export")
-    @ApiOperation("导出兑换码")
-    public void exportCode(
-            @RequestParam(required = false) String promotionLuckDrawId,
-            @RequestParam(required = false) String promotionLuckDrawCouponId,
-                           HttpServletRequest request,
-                           HttpServletResponse response) throws Exception {
-        ExcelData excelData = promotionLuckDrawLogic.exportCode(promotionLuckDrawId,promotionLuckDrawCouponId);
-        ExcelUtils.exportExcel(request,response,"兑换码.xlsx",excelData);
-    }
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/activity/PromotionQuestionnaireController.java

@@ -1,95 +0,0 @@
-package com.gree.mall.manager.controller.activity;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.activity.PromotionQuestionnaireAddBean;
-import com.gree.mall.manager.bean.goods.PromotionGroupListVO;
-import com.gree.mall.manager.bean.listvo.PromotionQuestionnairVO;
-import com.gree.mall.manager.bean.listvo.param.PromotionZfireParamBean;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.activity.PromotionQuestionnaireLogic;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-@Slf4j
-@RestController
-@RequiredArgsConstructor
-@Api(value = "问卷活动API", tags ={"问卷活动API"} )
-@RequestMapping(value = "/promotion/questionnaire", produces = "application/json; charset=utf-8")
-public class PromotionQuestionnaireController {
-
-    private final PromotionQuestionnaireLogic promotionQuestionnaireLogic;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "列表")
-    public ResponseHelper<IPage<PromotionQuestionnairVO>> list(
-            @RequestBody PromotionZfireParamBean zfireParamBean
-    ) {
-        IPage<PromotionQuestionnairVO> list = promotionQuestionnaireLogic.list(zfireParamBean);
-        return ResponseHelper.success(list, new TypeReference<PromotionQuestionnairVO>() {});
-    }
-
-    @PostMapping("/export")
-    @ApiOperation(value = "导出")
-    public void listExport(@RequestBody PromotionZfireParamBean zfireParamBean, HttpServletRequest request, HttpServletResponse response) throws Exception {
-        //2.查询要导出的内容
-        IPage<PromotionQuestionnairVO> page = promotionQuestionnaireLogic.list(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(page.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @ApiOperation(value = "新增")
-    @PostMapping("/add")
-    public ResponseHelper add(@RequestBody PromotionQuestionnaireAddBean bean) throws Exception {
-        promotionQuestionnaireLogic.add(bean);
-        return ResponseHelper.success();
-    }
-
-    @ApiOperation(value = "下载二维码")
-    @GetMapping("/download")
-    public void down(
-           @ApiParam(value = "活动id",required = true) @RequestParam String id,
-           @ApiParam(value = "活动二维码id",required = false) @RequestParam(required = false) String id2,
-            HttpServletResponse response
-    ) throws Exception {
-        promotionQuestionnaireLogic.batchDownload(id,id2,response);
-    }
-
-
-
-    @ApiOperation(value = "显示/隐藏")
-    @PostMapping("/show")
-    public ResponseHelper show(@RequestParam String id,@RequestParam Boolean isShow) throws Exception {
-        promotionQuestionnaireLogic.updateIsShow(id,isShow);
-        return ResponseHelper.success();
-    }
-
-
-    @ApiOperation(value = "详情")
-    @PostMapping("/detail")
-    public ResponseHelper<PromotionQuestionnaireAddBean > detail(@RequestParam String id) throws Exception {
-        PromotionQuestionnaireAddBean detail = promotionQuestionnaireLogic.detail(id);
-        return ResponseHelper.success(detail);
-    }
-
-
-    @ApiOperation(value = "终止")
-    @PostMapping("/stop")
-    public ResponseHelper stop(@RequestParam String id) throws Exception {
-        promotionQuestionnaireLogic.stop(id);
-        return ResponseHelper.success();
-    }
-
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/activity/SecKillController.java

@@ -1,193 +0,0 @@
-package com.gree.mall.manager.controller.activity;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.activity.CustomSecSpecBean;
-import com.gree.mall.manager.bean.activity.SecKillActivityBean;
-import com.gree.mall.manager.bean.activity.SecKillActivityStageBean;
-import com.gree.mall.manager.bean.goods.CustomSecSpecBeanVO;
-import com.gree.mall.manager.bean.goods.SecKillActivityStageBeanVO;
-import com.gree.mall.manager.bean.order.OrderShareVO;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.activity.SecKillLogic;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-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 javax.servlet.http.HttpServletResponse;
-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;
-
-    @ZfireList
-    @PostMapping("/spec/list/pageV2")
-    @ApiOperation(value = "秒杀商品列表V2")
-    public ResponseHelper<IPage<CustomSecSpecBeanVO>> pageV2Spec(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<CustomSecSpecBeanVO> page = secKillLogic.pageV2(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<CustomSecSpecBeanVO>() {});
-    }
-
-    @PostMapping("/spec/list/pageV2Export")
-    @ApiOperation(value = "秒杀商品列表V2导出")
-    public void pageV2Export(@RequestBody ZfireParamBean zfireParamBean, HttpServletRequest request, HttpServletResponse response) throws Exception {
-        //1.组装查询条件
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
-        //2.查询要导出的内容
-        IPage<CustomSecSpecBeanVO> page = secKillLogic.pageV2(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(page.getRecords(), zfireParam.getExportFields(), request, response);
-    }
-
-    @ZfireList
-    @PostMapping("/activity/list/pageV2")
-    @ApiOperation(value = "秒杀活动列表V2")
-    public ResponseHelper<IPage<SecKillActivityStageBeanVO>> pageV2Activity(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<SecKillActivityStageBeanVO> page = secKillLogic.pageV2Activity(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<SecKillActivityStageBeanVO>() {});
-    }
-
-    @PostMapping("/activity/list/pageV2Export")
-    @ApiOperation(value = "秒杀活动列表V2导出")
-    public void listExport(@RequestBody ZfireParamBean zfireParamBean, HttpServletRequest request, HttpServletResponse response) throws Exception {
-        //1.组装查询条件
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
-        //2.查询要导出的内容
-        IPage<SecKillActivityStageBeanVO> page = secKillLogic.pageV2Activity(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(page.getRecords(), zfireParam.getExportFields(), request, response);
-    }
-
-    @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();
-//    }
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/admin/AdminWebsitController.java

@@ -1,162 +0,0 @@
-package com.gree.mall.manager.controller.admin;
-
-import com.gree.mall.manager.bean.ExcelData;
-import com.gree.mall.manager.bean.admin.AdminWebsitNewBean;
-import com.gree.mall.manager.bean.admin.AdminWebsitTree;
-import com.gree.mall.manager.bean.workorder.AdminWebsitList;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.admin.AdminWebsitLogic;
-import com.gree.mall.manager.plus.entity.AdminWebsit;
-import com.gree.mall.manager.plus.entity.AdminWebsitPayConfig;
-import com.gree.mall.manager.plus.entity.AdminZone;
-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 me.chanjar.weixin.common.error.WxErrorException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-@Slf4j
-@RestController
-@Api(value = "企业微信部门管理API", tags = {"企业微信部门管理API"})
-@RequestMapping(value = "/admin/websit", produces = "application/json; charset=utf-8")
-public class AdminWebsitController {
-
-    @Autowired
-    AdminWebsitLogic adminWebsitLogic;
-
-    @GetMapping("/tree")
-    @ApiOperation("部门树")
-    public ResponseHelper<AdminWebsitTree> tree(HttpServletRequest request) {
-        List<AdminWebsitTree> tree = adminWebsitLogic.tree(request);
-        return ResponseHelper.success(tree);
-    }
-
-    @GetMapping("/list")
-    @ApiOperation("部门列表")
-    public ResponseHelper<List<AdminWebsit>> list(
-            @ApiParam(value = "A=平台 B=商户网点 C=普通网点") @RequestParam(required = false) String type,
-            @RequestParam(required = false) Boolean isAll,
-            @RequestParam(required = false) String websitId,
-            @RequestParam(required = false) String websitName,
-            @RequestParam(required = false) Boolean status,
-            @RequestParam(required = false) Boolean isIncre,
-            @RequestParam(required = false) String streetCode,
-            @RequestParam(required = false) String channelId,
-            @RequestParam(required = false) String categoryId,
-            @RequestParam(required = false) String orderSourceId,
-            @RequestParam(required = false) String orderSmallId,
-            @RequestParam(required = false) Boolean queryPartsWebsit,
-            @RequestParam(required = false)   @ApiParam(value = "网点属性 SELF=自建网点 MAJOR=第三方专业网点 MERCHANT=第三方经销商家网点")String attr,
-            @RequestParam(required = false) Integer level
-    ) {
-        List<AdminWebsit> list = adminWebsitLogic.list(attr,websitId,websitName,type, isAll, isIncre, status, streetCode, channelId, categoryId, orderSmallId, orderSourceId, queryPartsWebsit, level);
-        return ResponseHelper.success(list);
-    }
-
-
-    @GetMapping("/websitList")
-    @ApiOperation("网点列表")
-    public ResponseHelper<List<AdminWebsitList>> websitList(
-            @ApiParam(value = "A=平台 B=商户网点 C=普通网点") @RequestParam(required = false) String type,
-            @ApiParam(value = "当前权限网点") @RequestParam(required = false) Boolean isAll,
-            @ApiParam(value = "状态") @RequestParam(required = false) Boolean status,
-            @ApiParam(value = "是否增值网点") @RequestParam(required = false) Boolean isIncre,
-            @ApiParam(value = "街道id") @RequestParam(required = false) String streetCode,
-            @ApiParam(value = "渠道") @RequestParam(required = false) String channelId,
-            @ApiParam(value = "产品大类") @RequestParam(required = false) String categoryId,
-            @ApiParam(value = "工单来源") @RequestParam(required = false) String orderSource,
-            @ApiParam(value = "工单类型") @RequestParam(required = false) String orderSmallId
-    ) {
-        List<AdminWebsitList> list = adminWebsitLogic.websitList(type, isAll, isIncre, status, streetCode, channelId, categoryId, orderSmallId, orderSource);
-        return ResponseHelper.success(list);
-    }
-
-    @GetMapping("/zone/list")
-    @ApiOperation("区域列表")
-    public ResponseHelper<AdminZone> zoneList() {
-        List<AdminZone> adminZones = adminWebsitLogic.adminZoneList();
-        return ResponseHelper.success(adminZones);
-    }
-
-    @PostMapping("/add")
-    @ApiOperation("新增部门")
-    public ResponseHelper add(@RequestBody AdminWebsitNewBean adminWebsit, HttpServletRequest request) throws RemoteServiceException, WxErrorException {
-        adminWebsitLogic.add(adminWebsit, request);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/update")
-    @ApiOperation("修改部门")
-    public ResponseHelper update(@RequestBody AdminWebsitNewBean adminWebsit, HttpServletRequest request) throws RemoteServiceException, WxErrorException {
-        adminWebsitLogic.update(adminWebsit, request);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/delete")
-    @ApiOperation("删除部门")
-    public ResponseHelper delete(@RequestParam String id, HttpServletRequest request) throws WxErrorException {
-        adminWebsitLogic.delete(id, request);
-        return ResponseHelper.success();
-    }
-
-    @GetMapping("/detail")
-    @ApiOperation("部门详情")
-    public ResponseHelper<AdminWebsitNewBean> detail(@RequestParam String id) {
-        AdminWebsitNewBean detail = adminWebsitLogic.detail(id);
-        return ResponseHelper.success(detail);
-    }
-
-    @PostMapping("/save/pay/config")
-    @ApiOperation("新增编辑网点支付配置")
-    public ResponseHelper savePayConfig(@RequestBody AdminWebsitPayConfig payConfig, HttpServletRequest request) throws RemoteServiceException {
-        adminWebsitLogic.savePayConfig(payConfig, request);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/delete/pay/config")
-    @ApiOperation("删除网点支付配置")
-    public ResponseHelper deletePayConfig(@RequestParam String id, HttpServletRequest request) {
-        adminWebsitLogic.deletePayConfig(id, request);
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("/pay/config/list")
-    @ApiOperation("网点支付配置列表")
-    public ResponseHelper<List<AdminWebsitPayConfig>> payConfigList(
-            @ApiParam(value = "网点编号") @RequestParam(required = false) String websitId,
-            @ApiParam(value = "类别 M=辅材 P=配件") @RequestParam(required = false) String type,
-            @ApiParam(value = "状态 true=开启 false=关闭") @RequestParam(required = false) Boolean status
-    ) {
-        List<AdminWebsitPayConfig> list = adminWebsitLogic.payConfigList(websitId, type, status);
-        return ResponseHelper.success(list);
-    }
-
-    @PostMapping("/import")
-    @ApiOperation(value = "网点管理-导入(下载模板:网点管理导入模板.xlsx)")
-    public ResponseHelper<String> importData(
-            @RequestPart("file") MultipartFile file
-    ) throws Exception {
-        adminWebsitLogic.importData(file);
-        return ResponseHelper.success();
-    }
-
-    @GetMapping("/export")
-    @ApiOperation(value = "网点管理-导出")
-    public void export(
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        ExcelData excelData = adminWebsitLogic.exportData();
-        ExcelUtils.exportExcel(request, response, "网点管理列表.xlsx", excelData);
-    }
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/big/BigController.java

@@ -1,202 +0,0 @@
-package com.gree.mall.manager.controller.big;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gree.mall.manager.annotation.ApiNotAuth;
-import com.gree.mall.manager.bean.big.*;
-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.big.BigLogic;
-import com.gree.mall.manager.logic.common.CommonLogic;
-import com.gree.mall.manager.logic.common.WechatLogic;
-import com.gree.mall.manager.logic.common.kuaidi100.response.SubscribeResp;
-import com.gree.mall.manager.plus.entity.*;
-import com.gree.mall.manager.plus.service.AdminCompanyWechatService;
-import com.gree.mall.manager.plus.service.OrderDetailService;
-import com.gree.mall.manager.plus.service.OrderInfoService;
-import com.gree.mall.manager.utils.CommonUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import me.chanjar.weixin.common.error.WxErrorException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.NotBlank;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-
-@Slf4j
-@RestController
-@Api(value = "大屏API", tags ={"大屏API"} )
-@RequestMapping(value = "/big", produces = "application/json; charset=utf-8")
-public class BigController {
-
-    @Autowired
-    BigLogic bigLogic;
-
-
-
-    @ApiNotAuth
-    @ApiOperation("天气预报")
-    @GetMapping("/water/get")
-    public ResponseHelper<Map<String,Object>> getWater(
-            @ApiParam(value = "city",required = true) @RequestParam(required = true) String city
-    ){
-        Map<String, Object> water = bigLogic.getWater(city);
-        return ResponseHelper.success(water);
-    }
-
-
-
-    @PostMapping("/getRegion")
-    @ApiOperation(value = "获得区域坐标")
-    public ResponseHelper<String> getRegion(
-            @ApiParam(required = false, value = "国家") @RequestParam(required = false) String country,
-            @ApiParam(required = false, value = "省") @RequestParam(required = false) String province,
-            @ApiParam(required = false, value = "市") @RequestParam(required = false) String city,
-            @ApiParam(required = false, value = "区") @RequestParam(required = false) String area
-    ) throws IOException, RemoteServiceException {
-        String region = bigLogic.getRegion(country,province,city,area);
-        return ResponseHelper.success(region);
-    }
-
-
-
-    @PostMapping("/getLarge1")
-    @ApiOperation(value = "平台获得地图总数据")
-    public ResponseHelper<LargeOneBean> getLarge1(
-            @ApiParam(required = false, value = "省") @RequestParam(required = false) String province
-    ) throws IOException, RemoteServiceException {
-        LargeOneBean largeOneBean = bigLogic.getLarge1(province);
-        return ResponseHelper.success(largeOneBean);
-    }
-
-
-    @PostMapping("/getLarge2")
-    @ApiOperation(value = "商户获得地图总数据")
-    public ResponseHelper<LargeOneBean> getLarge2(
-    ) throws IOException, RemoteServiceException {
-        LargeOneBean largeOneBean = bigLogic.getLarge2();
-        return ResponseHelper.success(largeOneBean);
-    }
-
-
-    @PostMapping("/getLarge3")
-    @ApiOperation(value = "浏览量，访客量")
-    public ResponseHelper<List<largeSeeLogin>> getLarge3(
-    ) throws IOException, RemoteServiceException {
-        List<largeSeeLogin> largeOneBean = bigLogic.getLarge3();
-        return ResponseHelper.success(largeOneBean);
-    }
-
-
-
-    @PostMapping("/getLarge4")
-    @ApiOperation(value = "近30天辅配件统计")
-    public ResponseHelper<LargeMpBean> getLarge4(
-    ) throws IOException, RemoteServiceException {
-        LargeMpBean largeMpBean = bigLogic.getLarge4();
-        return ResponseHelper.success(largeMpBean);
-    }
-
-
-
-    @PostMapping("/getLarge5")
-    @ApiOperation(value = "近30天累计工单数量")
-    public ResponseHelper<LargeWorkerOrderBean> getLarge5(
-    ) throws IOException, RemoteServiceException {
-        LargeWorkerOrderBean largeMpBean = bigLogic.getLarge5();
-        return ResponseHelper.success(largeMpBean);
-    }
-
-
-    @PostMapping("/getLarge6")
-    @ApiOperation(value = "近30天工单趋势")
-    public ResponseHelper<List<LargeWorkerOrderDateBean>> getLarge6(
-    ) throws IOException, RemoteServiceException {
-        List<LargeWorkerOrderDateBean> largeMpBean = bigLogic.getLarge6();
-        return ResponseHelper.success(largeMpBean);
-    }
-
-
-
-    @PostMapping("/getLarge7")
-    @ApiOperation(value = "近30天累计订单统计")
-    public ResponseHelper<LargeOrderBean> getLarge7(
-    ) throws IOException, RemoteServiceException {
-        LargeOrderBean largeMpBean = bigLogic.getLarge7();
-        return ResponseHelper.success(largeMpBean);
-    }
-
-
-    @PostMapping("/getLarge8")
-    @ApiOperation(value = "近30天订单趋势")
-    public ResponseHelper<List<LargeOrderBean>> getLarge8(
-    ) throws IOException, RemoteServiceException {
-        List<LargeOrderBean> largeMpBean = bigLogic.getLarge8();
-        return ResponseHelper.success(largeMpBean);
-    }
-
-
-    @GetMapping("/list")
-    @ApiOperation(value = "商户街道完工数据")
-    public ResponseHelper<Page<LargeWorkerOrderList>> page(
-            HttpServletRequest request,
-            @ApiParam(value = "市",required = false) @RequestParam(required = false) String city,
-            @ApiParam(value = "省",required = false) @RequestParam(required = false) String province,
-            @ApiParam(value = "区",required = false) @RequestParam(required = false) String area,
-
-            @ApiParam(value = "页号",required = true) @RequestParam(required = true) Integer pageNum,
-            @ApiParam(value = "页大小",required = true) @RequestParam(required = true) Integer pageSize
-    ){
-        IPage<LargeWorkerOrderList> list = bigLogic.list(request,city, province,area, pageNum, pageSize);
-        return ResponseHelper.success(list);
-    }
-
-
-    @PostMapping("/getLarge9")
-    @ApiOperation(value = "数据省份获得")
-    public ResponseHelper<List<String>> getLarge9(
-    ) throws IOException, RemoteServiceException {
-        List<String> largeMpBean = bigLogic.getLarge9();
-        return ResponseHelper.success(largeMpBean);
-    }
-
-
-    @GetMapping("/getLarge10")
-    @ApiOperation(value = "区工单台数")
-    public ResponseHelper<List<LargeNumCity>> getLarge10(
-            HttpServletRequest request,
-            @ApiParam(value = "市",required = false) @RequestParam(required = false) String city,
-            @ApiParam(value = "省",required = false) @RequestParam(required = false) String province
-
-    ){
-        List<LargeNumCity> list = bigLogic.getLarge10(city, province);
-        return ResponseHelper.success(list);
-    }
-
-
-    @GetMapping("/getLarge11")
-    @ApiOperation(value = "市工单台数")
-    public ResponseHelper<LargeNumCity> getLarge11(
-            HttpServletRequest request,
-            @ApiParam(value = "市",required = false) @RequestParam(required = false) String city,
-            @ApiParam(value = "省",required = false) @RequestParam(required = false) String province
-
-    ){
-        LargeNumCity list = bigLogic.getLarge11(city, province);
-        return ResponseHelper.success(list);
-    }
-
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/big/ServiceClassController.java

@@ -1,14 +0,0 @@
-package com.gree.mall.manager.controller.big;
-
-import io.swagger.annotations.Api;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@Slf4j
-@RestController
-@Api(value = "大屏服务类API", tags ={"大屏服务类API"} )
-@RequestMapping(value = "/big/service/class", produces = "application/json; charset=utf-8")
-public class ServiceClassController {
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/comlist/ComListAllController.java

@@ -1,92 +0,0 @@
-package com.gree.mall.manager.controller.comlist;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.comlist.ComListAllLogic;
-import com.gree.mall.manager.logic.comlist.ComListLogic;
-import com.gree.mall.manager.plus.entity.ComDetailLog;
-import com.gree.mall.manager.plus.entity.ComList;
-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;
-
-@Slf4j
-@RestController
-@Api(value = "文件下发api", tags = {"文件下发api"})
-@RequestMapping(value = "/comAll/list", produces = "application/json; charset=utf-8")
-public class ComListAllController {
-
-    @Autowired
-    ComListAllLogic comListAllLogic;
-
-
-    @GetMapping("/list")
-    @ApiOperation(value = "万能通用附件列表")
-    public ResponseHelper<ComList> list(
-            @ApiParam(required = false, value = "标题") @RequestParam(required = false) String title,
-            @ApiParam(required = false, value = "备注") @RequestParam(required = false) String remark,
-            @ApiParam(required = false, value = "是否强制提醒 true/false") @RequestParam(required = false) Boolean isNotice,
-            @ApiParam(required = true, value = "页号") @RequestParam(required = true) Integer pageNo,
-            @ApiParam(required = true, value = "页大小") @RequestParam(required = true) Integer pageSize,
-            HttpServletRequest request
-    ) {
-        IPage<ComList> list = comListAllLogic.list(title, remark, isNotice, pageNo, pageSize, request);
-        return ResponseHelper.success(list);
-    }
-
-
-    @PostMapping("/delete")
-    @ApiOperation(value = "删除万能通用附件")
-    public ResponseHelper list(
-            @ApiParam(required = true, value = "id") @RequestParam(required = true) String id,
-            HttpServletRequest request
-    ) {
-        comListAllLogic.delete(id, request);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/yonge")
-    @ApiOperation(value = "上传万能通用列表附件")
-    public ResponseHelper yonge(
-            @ApiParam(required = true, value = "标题") @RequestParam(required = true) String title,
-            @ApiParam(required = false, value = "备注") @RequestParam(required = false) String remark,
-            @ApiParam(required = true, value = "file") @RequestParam(required = true) String file,
-            @ApiParam(required = false, value = "是否强制通知 true=是 false=否") @RequestParam(required = false) Boolean isNotice,
-            @ApiParam(required = false, value = "下载密码") @RequestParam(required = false) String downloadPwd,
-            HttpServletRequest request
-    ) throws Exception {
-        comListAllLogic.yonge(title, remark, file, isNotice, downloadPwd, request);
-        return ResponseHelper.success();
-    }
-
-    @GetMapping("/download")
-    @ApiOperation(value = "下载万能通用列表附件")
-    public void down(
-            @ApiParam(required = true, value = "id") @RequestParam(required = true) String id,
-            @ApiParam(required = false, value = "下载密码") @RequestParam(required = false) String downloadPwd,
-            HttpServletRequest request, HttpServletResponse response
-    ) throws Exception {
-        comListAllLogic.download(id, downloadPwd, request, response);
-        //return ResponseHelper.success(download);
-    }
-    @GetMapping("/download/log")
-    @ApiOperation(value = "下载记录")
-    public ResponseHelper<IPage<ComDetailLog>> downlog(
-            @ApiParam(required = true, value = "id") @RequestParam(required = true) String id,
-            @ApiParam(required = true, value = "页号") @RequestParam(required = true) Integer pageNo,
-            @ApiParam(required = true, value = "页大小") @RequestParam(required = true) Integer pageSize,
-            HttpServletRequest request
-    ) throws Exception {
-        IPage<ComDetailLog> comDetailLogIPage = comListAllLogic.logList(id, pageNo, pageSize, request);
-        return ResponseHelper.success(comDetailLogIPage);
-    }
-
-
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/comlist/ComListController.java

@@ -1,110 +0,0 @@
-package com.gree.mall.manager.controller.comlist;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.comlist.ComListLogic;
-import com.gree.mall.manager.plus.entity.ComDetailLog;
-import com.gree.mall.manager.plus.entity.ComList;
-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;
-
-@Slf4j
-@RestController
-@Api(value = "通用万能列表API", tags = {"中心文件下发API"})
-@RequestMapping(value = "/com/list", produces = "application/json; charset=utf-8")
-public class ComListController {
-
-    @Autowired
-    ComListLogic comListLogic;
-
-    @GetMapping("/list")
-    @ApiOperation(value = "万能通用附件列表")
-    public ResponseHelper<ComList> list(
-            @ApiParam(required = false, value = "标题") @RequestParam(required = false) String title,
-            @ApiParam(required = false, value = "备注") @RequestParam(required = false) String remark,
-            @ApiParam(required = false, value = "是否强制提醒 true/false") @RequestParam(required = false) Boolean isNotice,
-            @ApiParam(required = true, value = "页号") @RequestParam(required = true) Integer pageNo,
-            @ApiParam(required = true, value = "页大小") @RequestParam(required = true) Integer pageSize,
-            HttpServletRequest request
-    ) {
-        IPage<ComList> list = comListLogic.list(title, remark, isNotice, pageNo, pageSize, request);
-        return ResponseHelper.success(list);
-    }
-
-
-    @PostMapping("/delete")
-    @ApiOperation(value = "删除万能通用附件")
-    public ResponseHelper list(
-            @ApiParam(required = true, value = "id") @RequestParam(required = true) String id,
-            HttpServletRequest request
-    ) {
-        comListLogic.delete(id, request);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/yonge")
-    @ApiOperation(value = "上传万能通用列表附件")
-    public ResponseHelper yonge(
-            @ApiParam(required = true, value = "标题") @RequestParam(required = true) String title,
-            @ApiParam(required = false, value = "备注") @RequestParam(required = false) String remark,
-            @ApiParam(required = true, value = "file") @RequestParam(required = true) String file,
-            @ApiParam(required = false, value = "是否强制通知 true=是 false=否") @RequestParam(required = false) Boolean isNotice,
-            @ApiParam(required = false, value = "下载密码") @RequestParam(required = false) String downloadPwd,
-            HttpServletRequest request
-    ) throws Exception {
-        comListLogic.yonge(title, remark, file, isNotice, downloadPwd, request);
-        return ResponseHelper.success();
-    }
-
-    @GetMapping("/download")
-    @ApiOperation(value = "下载万能通用列表附件")
-    public void down(
-            @ApiParam(required = true, value = "id") @RequestParam(required = true) String id,
-            @ApiParam(required = false, value = "下载密码") @RequestParam(required = false) String downloadPwd,
-            HttpServletRequest request, HttpServletResponse response
-    ) throws Exception {
-        comListLogic.download(id, downloadPwd, request, response);
-        //return ResponseHelper.success(download);
-    }
-
-    @GetMapping("/download/get")
-    @ApiOperation("强制提醒-未下载的中心文件列表")
-    public ResponseHelper<IPage<ComList>> downGet(
-            @ApiParam(required = true, value = "页号") @RequestParam(required = true) Integer pageNo,
-            @ApiParam(required = true, value = "页大小") @RequestParam(required = true) Integer pageSize
-    ) throws Exception {
-        IPage<ComList> comListIPage = comListLogic.notDownComList(pageNo, pageSize);
-        return ResponseHelper.success(comListIPage);
-    }
-
-    @GetMapping("/download/batch")
-    @ApiOperation("强制提醒-批量下载文件")
-    public void downGet(
-            @ApiParam(required = true, value = "下载的文件数量上限") @RequestParam(required = true) Integer pageSize,
-            HttpServletRequest request, HttpServletResponse response
-    ) throws Exception {
-        comListLogic.download(pageSize, response);
-    }
-
-
-    @GetMapping("/download/log")
-    @ApiOperation(value = "下载记录")
-    public ResponseHelper<IPage<ComDetailLog>> downlog(
-            @ApiParam(required = true, value = "id") @RequestParam(required = true) String id,
-            @ApiParam(required = true, value = "页号") @RequestParam(required = true) Integer pageNo,
-            @ApiParam(required = true, value = "页大小") @RequestParam(required = true) Integer pageSize,
-            HttpServletRequest request
-    ) throws Exception {
-        IPage<ComDetailLog> comDetailLogIPage = comListLogic.logList(id, pageNo, pageSize, request);
-        return ResponseHelper.success(comDetailLogIPage);
-    }
-
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/comlist/WorkerComListController.java

@@ -1,96 +0,0 @@
-package com.gree.mall.manager.controller.comlist;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.bean.es.CommonListES;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.comlist.WorkerComListLogic;
-import com.gree.mall.manager.plus.entity.WorkerComList;
-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.util.List;
-
-
-@Slf4j
-@RestController
-@Api(value = "师傅-文件下发", tags ={"师傅-文件下发"} )
-@RequestMapping(value = "/worker/comlist", produces = "application/json; charset=utf-8")
-public class WorkerComListController {
-
-    @Autowired
-    WorkerComListLogic workerComListLogic;
-
-    @GetMapping("/list")
-    @ApiOperation(value = "万能通用附件列表")
-    public ResponseHelper<IPage<WorkerComList>> list(
-            @ApiParam(required = false, value = "师傅编号") @RequestParam(required = false) String workerNumber,
-            @ApiParam(required = false, value = "标题") @RequestParam(required = false) String title,
-            @ApiParam(required = false, value = "备注") @RequestParam(required = false) String remark,
-            @ApiParam(required = false, value = "状态 true=显示 false=隐藏") @RequestParam(required = false) Boolean status,
-            @ApiParam(required = true, value = "页号") @RequestParam(required = true) Integer pageNum,
-            @ApiParam(required = true, value = "页大小") @RequestParam(required = true) Integer pageSize
-
-    ){
-        IPage<WorkerComList> list = workerComListLogic.list(workerNumber,title, status, remark, pageNum, pageSize);
-        return ResponseHelper.success(list);
-    }
-
-    @PostMapping("/delete")
-    @ApiOperation(value = "删除万能通用附件")
-    public ResponseHelper list(
-            @ApiParam(required = true, value = "id") @RequestParam(required = true) String id
-    ){
-        workerComListLogic.delete(id);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/updateStatus")
-    @ApiOperation(value = "修改状态")
-    public ResponseHelper list(
-            @ApiParam(required = true, value = "id") @RequestParam(required = true) String id,
-            @ApiParam(required = true, value = "true=正常 false=隐藏") @RequestParam(required = true) Boolean status
-    ){
-        workerComListLogic.updateStatus(id,status);
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("/save")
-    @ApiOperation(value = "上传万能通用列表附件")
-    public ResponseHelper save(
-            @ApiParam(required = true, value = "标题") @RequestParam(required = true) String title,
-            @ApiParam(required = false, value = "备注") @RequestParam(required = false) String remark,
-            @ApiParam(required = true, value = "fileUrl") @RequestParam(required = true) String file
-    ) throws Exception {
-        workerComListLogic.save(title,remark,file);
-        return ResponseHelper.success();
-    }
-
-    @GetMapping("/record")
-    @ApiOperation(value = "通用列表-明细")
-    public ResponseHelper<List<CommonListES>> record(
-            @ApiParam(required = true, value = "列表id") @RequestParam(required = true) String comListId,
-            @ApiParam(required = true, value = "师傅编号") @RequestParam(required = true) String workerNumber
-    ) throws Exception {
-        List<CommonListES> record = workerComListLogic.record(comListId, workerNumber);
-        return ResponseHelper.success(record);
-    }
-
-    @GetMapping("/download")
-    @ApiOperation(value = "下载万能通用列表附件")
-    public void down(
-            @ApiParam(required = true, value = "comListId") @RequestParam(required = true) String comListId,
-            @ApiParam(required = false, value = "websitNumber") @RequestParam(required = false) String websitNumber,
-            HttpServletRequest request, HttpServletResponse response
-    ) throws Exception {
-        workerComListLogic.download(comListId,websitNumber, request, response);
-    }
-
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/common/CallRecordController.java

@@ -1,107 +0,0 @@
-package com.gree.mall.manager.controller.common;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.common.CallRecordOrderVo;
-import com.gree.mall.manager.bean.common.CallRecordVo;
-import com.gree.mall.manager.bean.workorder.IncreVO;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.unicom.UnicomLogic;
-import com.gree.mall.manager.plus.entity.CallRecord;
-import com.gree.mall.manager.plus.entity.CallSendRecord;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-@RestController
-@Api(value = "云呼API", tags ={"云呼API"} )
-@RequestMapping("unCall")
-public class CallRecordController {
-
-    @Autowired
-    UnicomLogic unicomLogic;
-
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "AI拨号记录")
-    public ResponseHelper<IPage<CallRecordVo>> list(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) throws RemoteServiceException {
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
-        IPage<CallRecordVo> increVOIPage = unicomLogic.list(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam);
-        return ResponseHelper.success(increVOIPage, new TypeReference<CallRecordVo>() {});
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation(value = "AI拨号记录导出")
-    public void listExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //1.组装查询条件
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
-        //2.查询要导出的内容
-        IPage<CallRecordVo> increVOIPage = unicomLogic.list(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam);
-        //3.导出
-        FieldUtils.exportData(increVOIPage.getRecords(), zfireParam.getExportFields(), request, response);
-    }
-
-    @PostMapping("unicome/config/save")
-    @ApiOperation(value = "云呼-保存配置")
-    public ResponseHelper saveUnicomeConfig(@ApiParam(value = "联通云呼integratedid") @RequestParam String unicomIntegratedId,
-                                            @ApiParam(value = "联通云呼ExtenType（支持三种方式Local（直线方式），sip（软电话），gateway（语音网关/IP话机）") @RequestParam String unicomIntegratedType) {
-        unicomLogic.saveConfig(unicomIntegratedId, unicomIntegratedType);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("unicome/call")
-    @ApiOperation(value = "云呼-拨打")
-    public ResponseHelper callUicome(
-            @ApiParam(value = "服务单号") @RequestParam String orderBaseId,
-            @ApiParam(value = "手机号") @RequestParam String phone,
-            @ApiParam(value = "A=回访",required = false) @RequestParam(required = false) String flag
-    ){
-        unicomLogic.commonlnte(phone,orderBaseId,flag);
-        return ResponseHelper.success();
-    }
-
-
-
-    @ZfireList
-    @PostMapping("/listOrder")
-    @ApiOperation(value = "工单通话记录列表")
-    public ResponseHelper<IPage<CallRecordOrderVo>> listOrder(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) throws RemoteServiceException {
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
-        IPage<CallRecordOrderVo> increVOIPage = unicomLogic.listOrder(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam);
-        return ResponseHelper.success(increVOIPage, new TypeReference<CallRecordOrderVo>() {});
-    }
-
-    @PostMapping("/list/orderExport")
-    @ApiOperation(value = "工单通话记录列表导出")
-    public void listOrderExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //1.组装查询条件
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
-        //2.查询要导出的内容
-        IPage<CallRecordOrderVo> increVOIPage = unicomLogic.listOrder(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam);
-        //3.导出
-        FieldUtils.exportData(increVOIPage.getRecords(), zfireParam.getExportFields(), request, response);
-    }
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/common/CommonController.java

@@ -1,225 +0,0 @@
-package com.gree.mall.manager.controller.common;
-
-import com.gree.mall.manager.annotation.ApiNotAuth;
-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.WechatLogic;
-import com.gree.mall.manager.logic.common.kuaidi100.response.SubscribeResp;
-import com.gree.mall.manager.plus.entity.*;
-import com.gree.mall.manager.plus.service.AdminCompanyWechatService;
-import com.gree.mall.manager.plus.service.OrderDetailService;
-import com.gree.mall.manager.plus.service.OrderInfoService;
-import com.gree.mall.manager.utils.CommonUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import me.chanjar.weixin.common.error.WxErrorException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.NotBlank;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-
-@Slf4j
-@RestController
-@Api(value = "公共API", tags ={"公共API"} )
-@RequestMapping(value = "/common", produces = "application/json; charset=utf-8")
-public class CommonController {
-
-    @Autowired
-    CommonLogic commonLogic;
-    @Autowired
-    ExpressLogic expressLogic;
-    @Autowired
-    WechatLogic wechatLogic;
-//    @Autowired
-//    GongdanLogic gongdanLogic;
-//    @Autowired
-//    AsyncWxTagLogic asyncWxTagLogic;
-    @Autowired
-    OrderInfoService orderInfoService;
-    @Autowired
-    OrderDetailService orderDetailService;
-    @Autowired
-    AdminCompanyWechatService adminCompanyWechatService;
-
-
-
-
-    @PostMapping("/upload")
-    @ApiOperation(value = "文件上传")
-    public ResponseHelper<CommonFile> upload(
-            @ApiParam(required = true, value = "附件") @RequestParam(required = true) MultipartFile file
-    ) throws IOException, RemoteServiceException {
-        CommonFile commonFile = commonLogic.uploadFile(file);
-        return ResponseHelper.success(commonFile);
-    }
-
-    @GetMapping("/express")
-    @ApiOperation(value = "查看物流")
-    public ResponseHelper<List<ExpressInfo>> express(
-            @ApiParam(required = true, value = "物流单号") @RequestParam(required = true) String logisticsNo,
-            @ApiParam(required = false, value = "快递公司code") @RequestParam(required = false) String companyCode
-    ) throws IOException, RemoteServiceException {
-        List<ExpressInfo> expressInfos = expressLogic.queryExpress(logisticsNo,companyCode);
-        return ResponseHelper.success(expressInfos);
-    }
-
-    @ApiNotAuth
-    @PostMapping("/express/callback")
-    @ApiOperation(value = "物流回调")
-    public SubscribeResp expressCallback(HttpServletRequest request) throws Exception {
-        expressLogic.expressCallBack(request);
-        SubscribeResp subscribeResp = new SubscribeResp();
-        subscribeResp.setResult(Boolean.TRUE);
-        subscribeResp.setReturnCode("200");
-        subscribeResp.setMessage("成功");
-        return subscribeResp;
-    }
-
-    @GetMapping("/express/company")
-    @ApiOperation(value = "所有物流公司")
-    public ResponseHelper<List<ExpressCompany>> companyList(
-    ) throws IOException, RemoteServiceException {
-        List<ExpressCompany> expressCompanies = expressLogic.expressCompanyList();
-        return ResponseHelper.success(expressCompanies);
-    }
-
-
-    @GetMapping("/region/list")
-    @ApiOperation(value = "地区列表")
-    public ResponseHelper<List<Region>> regionList(
-            @ApiParam(value = "父id(第一级传0)",required = true) @RequestParam(required = true) String pid
-    ) throws RemoteServiceException {
-        List<Region> list = commonLogic.queryRegionList(pid);
-        return ResponseHelper.success(list);
-    }
-
-
-    @GetMapping("/gongdan/smalltype")
-    @ApiOperation(value = "工单小类")
-    public ResponseHelper<List> regionList(
-            @ApiParam(value = "大类",required = false) @RequestParam(required = false) String mainNumber,
-            @ApiParam(value = "分类id",required = false) @RequestParam(required = false) String categoryId
-    ) throws Exception {
-
-        //List smallType = gongdanLogic.getSmallType(mainNumber,categoryId);
-        return ResponseHelper.success(new ArrayList<>());
-    }
-
-    @PostMapping("/companywechat/get")
-    @ApiOperation("获取商户配置二维码头像等详情")
-    public ResponseHelper<AdminCompanyWechat> getCompanyWechat(
-            @RequestParam String id
-    ){
-        AdminCompanyWechat one = adminCompanyWechatService.lambdaQuery()
-                //.select(AdminCompanyWechat::getQrcode1, AdminCompanyWechat::getQrcode2)
-                .eq(AdminCompanyWechat::getCompanyWechatId, id).one();
-        return ResponseHelper.success(one);
-    }
-
-
-//    @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);
-//    }
-
-
-//    @GetMapping("/test2")
-//    @ApiOperation(value = "本地成员同步到企业微信")
-//    public ResponseHelper test2() throws Exception {
-//        //本地的
-//        List<EnterpriseWechatWorker20220311> local = enterpriseWechatWorker20220311Service.list();
-//        //企微的
-//        List<EnterpriseWechatWorker> remote = enterpriseWechatWorkerService.list();
-//        List<String> remoteList = remote.stream().map(EnterpriseWechatWorker::getWechatUserId).collect(Collectors.toList());
-//        for(EnterpriseWechatWorker20220311 enterpriseWechatWorker : local){
-//            //存在则不处理
-//            if(remoteList.contains(enterpriseWechatWorker.getWechatUserId())){
-//                continue;
-//            }
-//            //不存在则同步到企业微信
-//            workWechatLogic.addWorkUser(enterpriseWechatWorker.getWechatUserId(),enterpriseWechatWorker.getName(),enterpriseWechatWorker.getMobile(),
-//                    enterpriseWechatWorker.getGender(),enterpriseWechatWorker.getEmail(),
-//                    Long.parseLong(enterpriseWechatWorker.getMainDepartment()),enterpriseWechatWorker.getPosition());
-//        }
-//        return ResponseHelper.success();
-//    }
-
-
-//    @ApiNotAuth
-//    @GetMapping("/external/last")
-//    @ApiOperation(value = "获取最新的客户信息")
-//    public ResponseHelper<Map<String,Object>> sync(
-//            @ApiParam(required = true, value = "企微成员手机号") @RequestParam(required = true) String mobile,
-//            @ApiParam(required = false, value = "外部联系人id") @RequestParam(required = false) String externalUserId
-//    ) throws WxErrorException {
-//        Map<String, Object> lastExternalUser = asyncWxTagLogic.getLastExternalUser(mobile,externalUserId);
-//        return ResponseHelper.success(lastExternalUser);
-//    }
-
-    @GetMapping("template/download")
-    @ApiOperation("下载模板")
-    public void download(@RequestParam(required = false) @NotBlank(message = "需下载的模板名称不能为空") String name, HttpServletResponse response) throws IOException {
-        CommonUtils.downloadFile(name, response);
-    }
-
-    @ApiNotAuth
-    @ApiOperation("获取获取前往小程序链接")
-    @GetMapping("/getUrlScheme")
-    public ResponseHelper<String> getUrlScheme(
-            @ApiParam(value = "通过 scheme 码进入小程序时的 query",required = false) @RequestParam(required = false) String query,
-            @ApiParam(required = false) @RequestParam(required = false) String companyWechatId
-    ) throws IOException, WxErrorException {
-        return ResponseHelper.success(wechatLogic.getUrlScheme(query,companyWechatId));
-    }
-
-    @ApiNotAuth
-    @GetMapping("/img/get")
-    @ApiOperation(value = "获取图片")
-    public void getImg(
-            @ApiParam(required = true, value = "附件key") @RequestParam(required = true) String key,
-            HttpServletResponse response
-    ) throws IOException, RemoteServiceException {
-        String file = commonLogic.getFile(key);
-        response.sendRedirect(file);
-    }
-
-    @GetMapping("oss/config")
-    @ApiOperation(value = "获取oss配置")
-    public ResponseHelper<Map<String, String>> getOssConfig() throws UnsupportedEncodingException {
-        return ResponseHelper.success(commonLogic.getOSSConfig());
-    }
-
-
-    @GetMapping("/computeVal")
-    @ApiOperation(value = "后台计算值", notes = "后台计算值 ", httpMethod = "GET")
-    public ResponseHelper<BigDecimal> computeVal(@RequestParam(defaultValue = "0") BigDecimal frontVal,
-                                                 @RequestParam(defaultValue = "0") BigDecimal afterVal,
-                                                 @RequestParam(defaultValue = "+") String operator,
-                                                 @RequestParam(defaultValue = "2") Integer scale,
-                                                 @RequestParam(defaultValue = "4", required = false) Integer roundingMode
-    ) {
-        return ResponseHelper.success(commonLogic.computeVal(frontVal, afterVal, operator, scale, roundingMode));
-    }
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/contract/CompanyCaAuthController.java

@@ -1,82 +0,0 @@
-package com.gree.mall.manager.controller.contract;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.contract.CompanyCaAuthVO;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.contract.CompanyCaAuthLogic;
-import com.gree.mall.manager.plus.entity.CompanyCaAuth;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-@Slf4j
-@RestController
-@Api(value = "企业CA认证API", tags ={"企业CA认证API"} )
-@RequestMapping("/company/ca/auth")
-public class CompanyCaAuthController {
-
-    @Resource
-    CompanyCaAuthLogic companyCaAuthLogic;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "企业CA认证-列表")
-    public ResponseHelper<IPage<CompanyCaAuthVO>> list(@RequestBody ZfireParamBean zfireParamBean) {
-        IPage<CompanyCaAuthVO> list = companyCaAuthLogic.list(zfireParamBean);
-        return ResponseHelper.success(list, new TypeReference<CompanyCaAuthVO>() {
-        });
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation(value = "企业CA认证-导出")
-    public void listExport(@RequestBody ZfireParamBean zfireParamBean, HttpServletRequest request, HttpServletResponse response) throws Exception {
-        //2.查询要导出的内容
-        IPage<CompanyCaAuthVO> list = companyCaAuthLogic.list(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(list.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "企业CA认证-详情")
-    public ResponseHelper<CompanyCaAuth> detail(@RequestParam String companyCaAuthId) {
-        CompanyCaAuth detail = companyCaAuthLogic.detail(companyCaAuthId);
-        return ResponseHelper.success(detail);
-    }
-
-    @PostMapping("/add")
-    @ApiOperation(value = "企业CA认证-添加")
-    public ResponseHelper add(@RequestBody CompanyCaAuth companyCaAuth) {
-        companyCaAuthLogic.add(companyCaAuth);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/update")
-    @ApiOperation(value = "企业CA认证-修改")
-    public ResponseHelper update(@RequestBody CompanyCaAuth companyCaAuth) {
-        companyCaAuthLogic.update(companyCaAuth);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/del")
-    @ApiOperation(value = "企业CA认证-删除")
-    public ResponseHelper delete(@RequestParam String companyCaAuthId) {
-        companyCaAuthLogic.delete(companyCaAuthId);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/get/auth")
-    @ApiOperation(value = "企业CA认证-获取法大大认证")
-    public ResponseHelper getAuth(@RequestParam String companyCaAuthId) throws Exception {
-        String url = companyCaAuthLogic.getAuth(companyCaAuthId);
-        return ResponseHelper.success(url);
-    }
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/contract/ContractTemplateController.java

@@ -1,105 +0,0 @@
-package com.gree.mall.manager.controller.contract;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.contract.ContractTemplateBean;
-import com.gree.mall.manager.bean.contract.ContractTemplateVO;
-import com.gree.mall.manager.bean.contract.ContractWebsitBean;
-import com.gree.mall.manager.enums.material.StateEnum;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.contract.ContractTemplateLogic;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-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 javax.servlet.http.HttpServletResponse;
-
-
-@Slf4j
-@RestController
-@Api(value = "合同模板API", tags ={"合同模板API"} )
-@RequestMapping("/contract/template")
-public class ContractTemplateController {
-
-    @Resource
-    ContractTemplateLogic contractTemplateLogic;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "合同模板-列表")
-    public ResponseHelper<IPage<ContractTemplateVO>> list(@RequestBody ZfireParamBean zfireParamBean) {
-        IPage<ContractTemplateVO> list = contractTemplateLogic.list(zfireParamBean);
-        return ResponseHelper.success(list, new TypeReference<ContractTemplateVO>() {
-        });
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation(value = "合同模板-导出")
-    public void listExport(@RequestBody ZfireParamBean zfireParamBean, HttpServletRequest request, HttpServletResponse response) throws Exception {
-        //2.查询要导出的内容
-        IPage<ContractTemplateVO> list = contractTemplateLogic.list(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(list.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @PostMapping("/query/rela/websit")
-    @ApiOperation(value = "查询上下级关系配置网点")
-    public ResponseHelper<IPage<ContractWebsitBean>> queryRelaWebsit(
-            @ApiParam(value = "合同模板id") @RequestParam(required = false) String contractTemplateId,
-            @ApiParam(value = "网点编号", required = true) @RequestParam String websitId,
-            @ApiParam(value = "网点名称", required = true) @RequestParam String websitName,
-            @ApiParam(value = "页号", required = true) @RequestParam Integer pageNum,
-            @ApiParam(value = "页大小", required = true) @RequestParam Integer pageSize
-    ) throws RemoteServiceException {
-        IPage<ContractWebsitBean> list = contractTemplateLogic.queryRelaWebsit(contractTemplateId, websitId, websitName, pageNum, pageSize);
-        return ResponseHelper.success(list);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "合同模板-详情")
-    public ResponseHelper<ContractTemplateBean> detail(
-            @ApiParam(value = "合同模板id", required = true) @RequestParam String contractTemplateId
-    ) {
-        ContractTemplateBean detail = contractTemplateLogic.detail(contractTemplateId);
-        return ResponseHelper.success(detail);
-    }
-
-    @PostMapping("add")
-    @ApiOperation(value = "合同模板-添加")
-    public ResponseHelper add(@RequestBody ContractTemplateBean contractTemplate) {
-        contractTemplateLogic.add(contractTemplate);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("update")
-    @ApiOperation(value = "合同模板-修改")
-    public ResponseHelper update(@RequestBody ContractTemplateBean contractTemplate) {
-        contractTemplateLogic.update(contractTemplate);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("status")
-    @ApiOperation(value = "合同模板-有效/无效")
-    public ResponseHelper status(
-            @ApiParam(value = "合同模板id", required = true) @RequestParam String contractTemplateId,
-            @ApiParam(value = "ON=有效 OFF=无效", required = true) @RequestParam StateEnum status) {
-        contractTemplateLogic.updateStatus(contractTemplateId, status);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("del")
-    @ApiOperation(value = "合同模板-删除")
-    public ResponseHelper delete(@RequestParam String contractTemplateId) {
-        contractTemplateLogic.delete(contractTemplateId);
-        return ResponseHelper.success();
-    }
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/contract/SettleRelaConfigController.java

@@ -1,141 +0,0 @@
-package com.gree.mall.manager.controller.contract;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.contract.SettleRelaConfigVO;
-import com.gree.mall.manager.bean.contract.WebsitFollowConfigBean;
-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.contract.SettleRelaConfigLogic;
-import com.gree.mall.manager.plus.entity.AdminWebsit;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.integration.redis.util.RedisLockRegistry;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-
-@Slf4j
-@RestController
-@Api(value = "结算上下级关系API", tags ={"结算上下级关系API"} )
-@RequestMapping(value = "/settle/rela/config", produces = "application/json; charset=utf-8")
-public class SettleRelaConfigController {
-
-    @Resource
-    SettleRelaConfigLogic settleRelaConfigLogic;
-    @Resource
-    RedisLockRegistry redisLockRegistry;
-
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "列表")
-    public ResponseHelper<IPage<SettleRelaConfigVO>> page(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<SettleRelaConfigVO> page = settleRelaConfigLogic.page(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<SettleRelaConfigVO>() {});
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation("导出")
-    public void listExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<SettleRelaConfigVO> baseVOIPage = settleRelaConfigLogic.page(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "详情")
-    public ResponseHelper<WebsitFollowConfigBean> detail(
-            @ApiParam(value = "websitId", required = true) @RequestParam String websitId
-    ) throws RemoteServiceException {
-        WebsitFollowConfigBean bean = settleRelaConfigLogic.detail(websitId);
-        return ResponseHelper.success(bean);
-    }
-
-    @PostMapping("/query/sub/websit")
-    @ApiOperation(value = "查询下级网点")
-    public ResponseHelper<IPage<AdminWebsit>> querySubWebsit(
-            @ApiParam(value = "网点编号") @RequestParam(required = false) String websitId,
-            @ApiParam(value = "网点名称") @RequestParam(required = false) String websitName,
-            @ApiParam(value = "页号", required = true) @RequestParam Integer pageNum,
-            @ApiParam(value = "页大小", required = true) @RequestParam Integer pageSize
-    ) throws RemoteServiceException {
-        IPage<AdminWebsit> list = settleRelaConfigLogic.querySubWebsit(websitId, websitName, pageNum, pageSize);
-        return ResponseHelper.success(list);
-    }
-
-    @PostMapping("/add")
-    @ApiOperation(value = "添加")
-    public ResponseHelper add(
-            @RequestBody WebsitFollowConfigBean bean
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LOCK_ORDER + bean.getWebsitId());
-        try {
-            if (obtain.tryLock(5, TimeUnit.SECONDS)) {
-                settleRelaConfigLogic.add(bean);
-            }
-        } catch (Exception e) {
-            log.error("【添加上下级关系处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/edit")
-    @ApiOperation(value = "编辑")
-    public ResponseHelper edit(
-            @RequestBody WebsitFollowConfigBean bean
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LOCK_ORDER + bean.getWebsitId());
-        try {
-            if (obtain.tryLock(5, TimeUnit.SECONDS)) {
-                settleRelaConfigLogic.edit(bean);
-            }
-        } catch (Exception e) {
-            log.error("【编辑上下级关系处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/import")
-    @ApiOperation(value = "导入(下载模板:结算上下级关系配置模板.xlsx)")
-    public ResponseHelper<String> materialImportData (
-            @RequestPart("file") MultipartFile file
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LOCK_ORDER + ":settlerelaimport");
-        try {
-            if (obtain.tryLock(5, TimeUnit.SECONDS)) {
-                settleRelaConfigLogic.importData(file);
-            }
-        } catch (Exception e) {
-            log.error("【导入上下级关系处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-        return ResponseHelper.success();
-    }
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/contract/WebsitContractSignController.java

@@ -1,83 +0,0 @@
-package com.gree.mall.manager.controller.contract;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.contract.AuthBean;
-import com.gree.mall.manager.bean.contract.WebsitContractSignRecordBean;
-import com.gree.mall.manager.bean.contract.WebsitContractSignVO;
-import com.gree.mall.manager.enums.contract.SignContractStatusEnum;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.contract.WebsitContractSignLogic;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-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 javax.servlet.http.HttpServletResponse;
-
-@Slf4j
-@RestController
-@Api(value = "网点合同签约API", tags ={"网点合同签约API"} )
-@RequestMapping("/websit/contract/sign/")
-public class WebsitContractSignController {
-
-    @Resource
-    WebsitContractSignLogic websitContractSignLogic;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "网点合同签约-列表")
-    public ResponseHelper<IPage<WebsitContractSignVO>> list(@RequestBody ZfireParamBean zfireParamBean) {
-        IPage<WebsitContractSignVO> list = websitContractSignLogic.list(zfireParamBean);
-        return ResponseHelper.success(list, new TypeReference<WebsitContractSignVO>() {
-        });
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation(value = "网点合同签约-导出")
-    public void listExport(@RequestBody ZfireParamBean zfireParamBean, HttpServletRequest request, HttpServletResponse response) throws Exception {
-        //2.查询要导出的内容
-        IPage<WebsitContractSignVO> list = websitContractSignLogic.list(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(list.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "网点合同签约-详情")
-    public ResponseHelper<WebsitContractSignRecordBean> detail(@RequestParam String id) {
-        WebsitContractSignRecordBean detail = websitContractSignLogic.detail(id);
-        return ResponseHelper.success(detail);
-    }
-
-    @PostMapping("/cancel")
-    @ApiOperation(value = "网点合同签约-失效")
-    public ResponseHelper cancel(@RequestParam String id) {
-        websitContractSignLogic.cancel(id);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/sign")
-    @ApiOperation(value = "网点合同签约-签约")
-    public ResponseHelper<AuthBean> sign(
-            @ApiParam(value = "id", required = true) @RequestParam String id,
-            @ApiParam(value = "返回地址", required = true) @RequestParam String returnUrl) throws Exception {
-        AuthBean bean = websitContractSignLogic.sign(id, returnUrl);
-        return ResponseHelper.success(bean);
-    }
-
-    @PostMapping("/confirm")
-    @ApiOperation(value = "网点合同签约-审核")
-    public ResponseHelper confirm(
-            @ApiParam(value = "id", required = true) @RequestParam String id,
-            @ApiParam(value = "状态 OK=通过 REJECT=驳回", required = true) @RequestParam SignContractStatusEnum status,
-            @ApiParam(value = "备注") @RequestParam(required = false) String remark) {
-        websitContractSignLogic.confirm(id, status, remark);
-        return ResponseHelper.success();
-    }
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/count/CountController.java

@@ -1,82 +0,0 @@
-package com.gree.mall.manager.controller.count;
-
-import com.gree.mall.manager.annotation.ApiNotAuth;
-import com.gree.mall.manager.bean.admin.AdminUserCom;
-import com.gree.mall.manager.bean.count.CountBean;
-import com.gree.mall.manager.bean.count.CountOrderBean;
-import com.gree.mall.manager.bean.count.GoodsRankBean;
-import com.gree.mall.manager.bean.count.WebsitSaleCountBean;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.count.CountLogic;
-import io.swagger.annotations.*;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-import java.util.Map;
-
-@Slf4j
-@RestController
-@Api(value = "统计", tags ={"统计"} )
-@RequestMapping(value = "/count", produces = "application/json; charset=utf-8")
-public class CountController {
-
-
-    @Autowired
-    CountLogic countLogic;
-
-    @GetMapping("/info")
-    @ApiOperation(value = "概况")
-    public ResponseHelper<CountBean> info(HttpServletRequest request) {
-        CountBean info = countLogic.info(request);
-        return ResponseHelper.success(info);
-    }
-
-    @GetMapping("/goods/rank")
-    @ApiOperation(value = "商品销量排行")
-    public ResponseHelper<List<GoodsRankBean>> goodsRank(
-            @ApiParam(value = "时间类型(1=今天，2=昨日，3=最近7天，4=本月)",required = true) @RequestParam Integer flag,
-            HttpServletRequest request
-    ) {
-        List<GoodsRankBean> goodsRankBeans = countLogic.countGoodsRank(flag,request);
-        return ResponseHelper.success(goodsRankBeans);
-    }
-
-
-    @GetMapping("/order")
-    @ApiOperation(value = "交易概述")
-    public ResponseHelper<CountOrderBean> order(
-            @ApiParam(value = "INSTALL:产品  REPAIR:服务",required = false) @RequestParam(required = false) String workOrderType,
-            @ApiParam(value = "时间类型(1=今天，2=昨日，3=最近7天，4=本月)",required = true) @RequestParam Integer flag,
-            HttpServletRequest request
-    ) {
-        CountOrderBean order = countLogic.order(workOrderType,flag,request);
-        return ResponseHelper.success(order);
-    }
-
-    @ApiNotAuth
-    @GetMapping("/work/amount")
-    @ApiOperation("师傅销售额")
-    public ResponseHelper<List<Map<String, Object>>> workAmount(
-            @ApiParam(value = "开始时间",required = true) @RequestParam String startTime,
-            @ApiParam(value = "结束时间",required = true) @RequestParam String endTime,
-            HttpServletRequest request
-    ) {
-        List<Map<String, Object>> maps = countLogic.queryWorkAmount(startTime, endTime,request);
-        return ResponseHelper.success(maps);
-    }
-
-
-    @ApiNotAuth
-    @GetMapping("/websit/amount")
-    @ApiOperation("网点销售额")
-    public ResponseHelper<WebsitSaleCountBean> workAmount(
-            @ApiParam(value = "网点编号集",required = true) @RequestParam List<String> websitNumbers
-    ) {
-        WebsitSaleCountBean websitSaleCountBean = countLogic.queryWebsitAmount(websitNumbers);
-        return ResponseHelper.success(websitSaleCountBean);
-    }
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/count/DataCountController.java

@@ -1,70 +0,0 @@
-package com.gree.mall.manager.controller.count;
-
-import com.gree.mall.manager.bean.count.IncreCount;
-import com.gree.mall.manager.bean.count.MaterialCount;
-import com.gree.mall.manager.bean.count.RepairProjectCount;
-import com.gree.mall.manager.bean.workorder.MaterialPeiJianCount;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.count.CountLogic;
-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.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-
-@Slf4j
-@RestController
-@Api(value = "数据看板", tags ={"数据看板"} )
-@RequestMapping(value = "/dataCount", produces = "application/json; charset=utf-8")
-public class DataCountController {
-
-
-    @Autowired
-    CountLogic countLogic;
-
-    @GetMapping("/repairProject")
-    @ApiOperation(value = "工程维保首页")
-    public ResponseHelper<RepairProjectCount> repairProject(HttpServletRequest request) {
-        RepairProjectCount repairProjectCount = countLogic.repairProject(request);
-        return ResponseHelper.success(repairProjectCount);
-    }
-
-
-    @GetMapping("/increCount")
-    @ApiOperation(value = "增值服务首页")
-    public ResponseHelper<IncreCount> increCount(
-            @ApiParam(value = "开始时间",required = false) @RequestParam(required = false) String startTime,
-            @ApiParam(value = "结束时间",required = false) @RequestParam(required = false) String endTime,
-
-            HttpServletRequest request) {
-        IncreCount increCount = countLogic.increCount(startTime,endTime,request);
-        return ResponseHelper.success(increCount);
-    }
-
-
-    @GetMapping("/materialCount")
-    @ApiOperation(value = "辅材首页")
-    public ResponseHelper<MaterialCount> materialCount(
-
-            HttpServletRequest request) {
-        MaterialCount materialCount = countLogic.materialCount(request);
-        return ResponseHelper.success(materialCount);
-    }
-
-
-    @GetMapping("/materialPeiJianCount")
-    @ApiOperation(value = "配件首页")
-    public ResponseHelper<MaterialPeiJianCount> MaterialPeiJianCount(
-
-            HttpServletRequest request) {
-        MaterialPeiJianCount materialCount = countLogic.MaterialPeiJianCount(request);
-        return ResponseHelper.success(materialCount);
-    }
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/coupon/CouponController.java

@@ -1,195 +0,0 @@
-package com.gree.mall.manager.controller.coupon;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.coupon.*;
-import com.gree.mall.manager.bean.goods.CustomSecSpecBeanVO;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.coupon.CouponLogic;
-import com.gree.mall.manager.plus.entity.Coupon;
-import com.gree.mall.manager.plus.entity.UserCoupon;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-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 org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.text.ParseException;
-import java.util.Date;
-
-@Slf4j
-@RestController
-@Api(value = "优惠券管理", tags ={"优惠券管理"} )
-@RequestMapping(value = "/coupon", produces = "application/json; charset=utf-8")
-public class CouponController {
-
-    @Resource
-    CouponLogic couponLogic;
-
-    @ZfireList
-    @PostMapping("/list/pageV2")
-    @ApiOperation(value = "优惠券列表V2")
-    public ResponseHelper<IPage<CouponPageBeanVO>> pageV2Spec(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<CouponPageBeanVO> page = couponLogic.pageV2(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<CouponPageBeanVO>() {});
-    }
-
-    @PostMapping("/list/pageV2Export")
-    @ApiOperation(value = "优惠券列表V2导出")
-    public void pageV2Export(@RequestBody ZfireParamBean zfireParamBean, HttpServletRequest request, HttpServletResponse response) throws Exception {
-        //1.组装查询条件
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
-        //2.查询要导出的内容
-        IPage<CouponPageBeanVO> page = couponLogic.pageV2(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(page.getRecords(), zfireParam.getExportFields(), request, response);
-    }
-
-
-    @GetMapping("/list/page")
-    @ApiOperation(value = "优惠券列表")
-    public ResponseHelper<IPage<CouponPageBean>> page(
-            @ApiParam(value = "券名称") @RequestParam(required = false) String couponName,
-            @ApiParam(value = "券类型") @RequestParam(required = false) String couponType,
-            @ApiParam(value = "券标志") @RequestParam(required = false) String flag,
-            @ApiParam(value = "页号",required = true) @RequestParam Integer pageNum,
-            @ApiParam(value = "页大小",required = true) @RequestParam Integer pageSize,
-            HttpServletRequest request
-    ) throws RemoteServiceException {
-        IPage<CouponPageBean> page = couponLogic.page(couponName, couponType, flag, pageNum, pageSize,request);
-        return ResponseHelper.success(page);
-    }
-
-    @GetMapping("/detail")
-    @ApiOperation(value = "券详情")
-    public ResponseHelper<CouponDetailBean> detail(
-            @ApiParam(value = "id",required = true) @RequestParam String couponId
-    ) throws RemoteServiceException {
-        CouponDetailBean detail = couponLogic.detail(couponId);
-        return ResponseHelper.success(detail);
-    }
-
-    @PostMapping("/add")
-    @ApiOperation(value = "新增券")
-    public ResponseHelper add(
-            HttpServletRequest request,
-            @ApiParam(value = "object",required = true) @RequestBody CouponBean couponBean)
-            throws RemoteServiceException {
-        couponLogic.add(request, couponBean);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/update")
-    @ApiOperation(value = "修改券")
-    public ResponseHelper update(
-            HttpServletRequest request,
-            @ApiParam(value = "object",required = true) @RequestBody CouponBean couponBean)
-            throws RemoteServiceException {
-        couponLogic.update(request, couponBean);
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("/reissue")
-    @ApiOperation(value = "补发业务员券")
-    public ResponseHelper reissueCoupon(
-            HttpServletRequest request,
-            @ApiParam(value = "object",required = true) @RequestBody ReissueCouponBean reissueCouponBean)
-            throws RemoteServiceException {
-        couponLogic.reissueCoupon(request, reissueCouponBean);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/change/flag")
-    @ApiOperation(value = "券标志")
-    public ResponseHelper change(
-            @ApiParam(value = "券id",required = true) @RequestParam String couponId,
-            @ApiParam(value = "开始时间") @RequestParam(required = false) String startDate,
-            @ApiParam(value = "结束时间") @RequestParam(required = false) String endDate,
-            @ApiParam(value = "券标志:START=进行中 CANCEL=取消",required = true) @RequestParam String flag
-    ) throws RemoteServiceException {
-        couponLogic.updateFlag(couponId, startDate, endDate, flag);
-        return ResponseHelper.success();
-    }
-
-    @GetMapping("/data")
-    @ApiOperation(value = "券数据")
-    public ResponseHelper<CouponBean> data(
-            @ApiParam(value = "id",required = true) @RequestParam String couponId
-    ) throws RemoteServiceException {
-        CouponDataBean data = couponLogic.data(couponId);
-        return ResponseHelper.success(data);
-    }
-
-    @GetMapping("/userCouponDetail/query")
-    @ApiOperation(value = "用户领取优惠券明细")
-    public ResponseHelper<IPage<UserCouponBean>> receiveCouponDetail(
-            @ApiParam(value = "我的优惠券id",required = true) @RequestParam String userCouponId,
-            @ApiParam(value = "页号",required = true) @RequestParam Integer pageNo,
-            @ApiParam(value = "页大小",required = true) @RequestParam Integer pageSize
-            )throws RemoteServiceException{
-        return ResponseHelper.success(couponLogic.receiveCouponDetail(userCouponId,pageNo,pageSize));
-    }
-
-    @GetMapping("/user/page")
-    @ApiOperation(value = "获取领取优惠券用户列表")
-    public ResponseHelper<CouponBean> user(
-            HttpServletRequest request,
-            @ApiParam(value = "手机号",required = false) @RequestParam(required = false) String tel,
-            @ApiParam(value = "注册时间",required = false) @RequestParam(required = false) Date registerTime,
-            @ApiParam(value = "keyword",required = false) @RequestParam (required = false)String keyword,
-            @ApiParam(value = "角色 GENERAL=普通用户 SERVICE=业务员",required = false) @RequestParam (required = false)String type,
-            @ApiParam(value = "页号",required = true) @RequestParam Integer pageNo,
-            @ApiParam(value = "页大小",required = true) @RequestParam Integer pageSize
-    ) throws RemoteServiceException {
-        return ResponseHelper.success(couponLogic.userList(request, tel,registerTime,keyword,type,pageNo,pageSize));
-    }
-
-
-    @GetMapping("/list/spec/select")
-    @ApiOperation(value = "优惠券选择活动商品列表")
-    public ResponseHelper pageSpecGoods(
-            HttpServletRequest request,
-            @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
-    ) throws Exception {
-        return ResponseHelper.success(couponLogic.goodsSpecList(request, categoryId,keyword,pageNum, pageSize));
-    }
-
-
-    @GetMapping("/list/export")
-    @ApiOperation(value = "优惠券导出")
-    public void export(HttpServletRequest request, HttpServletResponse response,
-                                                        @ApiParam(value = "券名称") @RequestParam(required = false) String couponName,
-                                                        @ApiParam(value = "券类型") @RequestParam(required = false) String couponType,
-                                                        @ApiParam(value = "券标志") @RequestParam(required = false) String flag
-    ) throws Exception {
-        couponLogic.export(request,response,couponName, couponType, flag);
-    }
-
-
-    @PostMapping("/louxx/import")
-    @ApiOperation("楼小贤活动券")
-    public ResponseHelper louxiaoxian(
-            @ApiParam(required = true, value = "excel文件") @RequestParam(required = true) MultipartFile file
-    ) throws IOException, ParseException {
-        couponLogic.importLxx(file);
-        return ResponseHelper.success();
-    }
-
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/engin/EnginPayManageController.java

@@ -1,130 +0,0 @@
-package com.gree.mall.manager.controller.engin;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.engin.EnginPayManageBean;
-import com.gree.mall.manager.bean.engin.EnginPayManageGatherVO;
-import com.gree.mall.manager.bean.engin.EnginPayManageVO;
-import com.gree.mall.manager.bean.material.base.WebsitGoodsAloneBean;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.engin.EnginPayManageLogic;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-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 org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
-
-@Slf4j
-@RestController
-@Api(value = "工程开单收款管理", tags ={"工程开单收款管理API"} )
-@RequestMapping(value = "/engin/pay", produces = "application/json; charset=utf-8")
-public class EnginPayManageController {
-
-    @Resource
-    EnginPayManageLogic enginPayManageLogic;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "工程开单收款管理-列表")
-    public ResponseHelper<IPage<EnginPayManageVO>> list(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<EnginPayManageVO> page = enginPayManageLogic.list(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<EnginPayManageVO>() {});
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation("工程开单收款管理-导出")
-    public void listExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<EnginPayManageVO> baseVOIPage = enginPayManageLogic.list(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "工程开单收款管理-详情")
-    public ResponseHelper<EnginPayManageBean> detail(
-            @ApiParam(value = "id", required = true) @RequestParam String id
-    ) throws RemoteServiceException {
-        EnginPayManageBean bean = enginPayManageLogic.detail(id);
-        return ResponseHelper.success(bean);
-    }
-
-    @PostMapping("/save")
-    @ApiOperation(value = "工程开单收款管理-提交")
-    public ResponseHelper<EnginPayManageBean> save(
-            HttpServletRequest request,
-            @RequestBody EnginPayManageBean bean
-    ) throws Exception {
-        enginPayManageLogic.save(request, bean);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/confirm")
-    @ApiOperation(value = "工程开单收款管理-审核")
-    public ResponseHelper confirm(
-            HttpServletRequest request,
-            @ApiParam(value = "id", required = true) @RequestParam String id
-    ) throws Exception {
-        enginPayManageLogic.confirm(request, id);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/pay")
-    @ApiOperation(value = "工程开单收款管理-收款")
-    public ResponseHelper<WebsitGoodsAloneBean> pay(
-            @ApiParam(value = "id", required = true) @RequestParam String id,
-            @ApiParam(value = "收款金额", required = true) @RequestParam BigDecimal amount,
-            @ApiParam(value = "收款凭证") @RequestParam(required = false) String fileUrl,
-            @ApiParam(value = "备注") @RequestParam(required = false) String payRemark
-    ) throws Exception {
-        enginPayManageLogic.pay(id, amount, fileUrl, payRemark);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/import")
-    @ApiOperation(value = "工程开单收款管理-导入(下载模板:工程收款管理模板.xlsx)")
-    public ResponseHelper<String> importData (
-            @RequestPart("file") MultipartFile file
-    ) throws Exception {
-        return ResponseHelper.success(enginPayManageLogic.importData(file));
-    }
-
-    @ZfireList
-    @PostMapping("/gather/list")
-    @ApiOperation(value = "工程开单收款管理汇总-列表")
-    public ResponseHelper<IPage<EnginPayManageGatherVO>> gatherList(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<EnginPayManageGatherVO> page = enginPayManageLogic.gatherList(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<EnginPayManageGatherVO>() {});
-    }
-
-    @PostMapping("/gather/list/export")
-    @ApiOperation("工程开单收款管理汇总-导出")
-    public void gatherListExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<EnginPayManageGatherVO> baseVOIPage = enginPayManageLogic.gatherList(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/engin/OrderEnginBaseController.java

@@ -1,77 +0,0 @@
-package com.gree.mall.manager.controller.engin;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.engin.OrderEnginBaseBean;
-import com.gree.mall.manager.bean.engin.OrderEnginBaseVO;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.engin.OrderEnginBaseLogic;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-
-@Slf4j
-@RestController
-@Api(value = "工程基础资料API", tags = {"工程基础资料API"})
-@Validated
-@RequestMapping(value = "/order/engin/base", produces = "application/json; charset=utf-8")
-public class OrderEnginBaseController {
-
-    @Resource
-    OrderEnginBaseLogic orderEnginBaseLogic;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "工程基础资料-列表")
-    public ResponseHelper<Page<OrderEnginBaseVO>> list(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<OrderEnginBaseVO> vo = orderEnginBaseLogic.list(zfireParamBean);
-        return ResponseHelper.success(vo, new TypeReference<OrderEnginBaseVO>() {});
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation(value = "工程基础资料-导出")
-    public void listExport(@RequestBody ZfireParamBean zfireParamBean, HttpServletRequest request, HttpServletResponse response) throws Exception {
-        //1.组装查询条件
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
-        //2.查询要导出的内容
-        IPage<OrderEnginBaseVO> page = orderEnginBaseLogic.list(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(page.getRecords(), zfireParam.getExportFields(), request, response);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "工程基础资料-详情")
-    public ResponseHelper<OrderEnginBaseBean> detail(
-            @ApiParam(value = "id", required = true) @RequestParam String id
-    ) throws RemoteServiceException {
-        OrderEnginBaseBean bean = orderEnginBaseLogic.detail(id);
-        return ResponseHelper.success(bean);
-    }
-
-    @PostMapping("/save")
-    @ApiOperation(value = "工程基础资料-保存")
-    public ResponseHelper save(
-           @Valid @RequestBody OrderEnginBaseBean bean
-    ) throws Exception {
-
-        orderEnginBaseLogic.save(bean);
-
-        return ResponseHelper.success();
-    }
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/engin/OrderEnginManagerController.java

@@ -1,97 +0,0 @@
-package com.gree.mall.manager.controller.engin;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.engin.OrderEnginBaseVO;
-import com.gree.mall.manager.bean.engin.WebsitSalesManagerDetail;
-import com.gree.mall.manager.bean.engin.WebsitSalesManagerVO;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.engin.WebsitGoodsMangerLogic;
-import com.gree.mall.manager.plus.entity.WebsitSalesManagerPrice;
-import com.gree.mall.manager.plus.mapper.WebsitGoodsMapper;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
-import java.util.List;
-
-@Slf4j
-@RestController
-@Api(value = "工程辅材/配件收款管理", tags = {"工程辅材/配件收款管理"})
-@Validated
-@RequestMapping(value = "/order/engin/manger", produces = "application/json; charset=utf-8")
-public class OrderEnginManagerController {
-
-    @Resource
-    WebsitGoodsMangerLogic websitGoodsMangerLogic;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "工程辅材/配件收款-列表")
-    public ResponseHelper<Page<WebsitSalesManagerVO>> list(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<WebsitSalesManagerVO> vo = websitGoodsMangerLogic.list(zfireParamBean);
-        return ResponseHelper.success(vo, new TypeReference<WebsitSalesManagerVO>() {});
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation(value = "工程辅材/配件收款-导出")
-    public void listExport(@RequestBody ZfireParamBean zfireParamBean, HttpServletRequest request, HttpServletResponse response) throws Exception {
-        //1.组装查询条件
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
-        //2.查询要导出的内容
-        IPage<WebsitSalesManagerVO> page = websitGoodsMangerLogic.list(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(page.getRecords(), zfireParam.getExportFields(), request, response);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "工程辅材/配件收款-详情")
-    public ResponseHelper<WebsitSalesManagerDetail> detail(
-            @ApiParam(value = "id", required = true) @RequestParam String id
-    ) throws RemoteServiceException {
-        WebsitSalesManagerDetail bean = websitGoodsMangerLogic.detail(id);
-        return ResponseHelper.success(bean);
-    }
-
-
-    @PostMapping("/detailPrice")
-    @ApiOperation(value = "工程辅材/配件收款-收款信息")
-    public ResponseHelper<List<WebsitSalesManagerPrice>> detailPrice(
-            @ApiParam(value = "工程机编号", required = true) @RequestParam String orderEnginBaseId,
-            @ApiParam(value = "商品类型 M=辅材 P=配件", required = true) @RequestParam String goodsType
-    ) throws RemoteServiceException {
-        List<WebsitSalesManagerPrice> bean = websitGoodsMangerLogic.detailPrice(orderEnginBaseId,goodsType);
-        return ResponseHelper.success(bean);
-    }
-
-    @PostMapping("/givePrice")
-    @ApiOperation(value = "工程辅材/配件收款-提交收款信息")
-    public ResponseHelper givePrice(
-            @ApiParam(value = "工程机编号", required = true) @RequestParam(required = true) String orderEnginBaseId,
-            @ApiParam(value = "金额", required = true) @RequestParam(required = true) BigDecimal price,
-            @ApiParam(value = "凭证", required = true) @RequestParam(required = true) String urlPrc,
-            @ApiParam(value = "备注", required = false) @RequestParam(required = false) String remark,
-            @ApiParam(value = "关联订单", required = true) @RequestParam(required = true) String orderId,
-            @ApiParam(value = "类型", required = true) @RequestParam(required = true) String goodsType
-    ) throws RemoteServiceException {
-        if (price.compareTo(new BigDecimal("0")) == -1)
-            throw new RemoteServiceException("金额不能为负数");
-        websitGoodsMangerLogic.givePrice(price,orderEnginBaseId,urlPrc,remark,orderId,goodsType);
-        return ResponseHelper.success();
-    }
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/engin/ProjectRepairController.java

@@ -1,180 +0,0 @@
-package com.gree.mall.manager.controller.engin;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.engin.ProjectRepairBean;
-import com.gree.mall.manager.bean.engin.ProjectRepairVO;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.engin.ProjectRepairLogic;
-import com.gree.mall.manager.plus.entity.RpProjectRepairProduct;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-import javax.validation.Valid;
-
-@Slf4j
-@RestController
-@Api(value = "工程维保API", tags = {"工程维保API"})
-@Validated
-@RequestMapping(value = "/engin/project/repair", produces = "application/json; charset=utf-8")
-public class ProjectRepairController {
-
-    @Resource
-    ProjectRepairLogic projectRepairLogic;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "工程维保-列表")
-    public ResponseHelper<Page<ProjectRepairVO>> list(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<ProjectRepairVO> vo = projectRepairLogic.list(zfireParamBean);
-        return ResponseHelper.success(vo, new TypeReference<ProjectRepairVO>() {});
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation(value = "工程维保-导出")
-    public void listExport(@RequestBody ZfireParamBean zfireParamBean, HttpServletRequest request, HttpServletResponse response) throws Exception {
-        //1.组装查询条件
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
-        //2.查询要导出的内容
-        IPage<ProjectRepairVO> page = projectRepairLogic.list(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(page.getRecords(), zfireParam.getExportFields(), request, response);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "工程维保-详情")
-    public ResponseHelper<ProjectRepairBean> detail(
-            @ApiParam(value = "id", required = true) @RequestParam String id
-    ) throws RemoteServiceException {
-        ProjectRepairBean bean = projectRepairLogic.detail(id);
-        return ResponseHelper.success(bean);
-    }
-
-    @PostMapping("/save")
-    @ApiOperation(value = "工程维保-保存")
-    public ResponseHelper save(
-           @Valid @RequestBody ProjectRepairBean bean
-    ) throws Exception {
-
-        projectRepairLogic.save(bean);
-
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/brand")
-    @ApiOperation("工程维保-品牌(已去重)")
-    public ResponseHelper<List<RpProjectRepairProduct>> brand(
-            @ApiParam(value = "维保id",required = true) @RequestParam String repairProjectId
-    ){
-        List<RpProjectRepairProduct> brands = projectRepairLogic.brand(repairProjectId);
-        return ResponseHelper.success(brands);
-    }
-
-    @PostMapping("/main")
-    @ApiOperation("工程维保-大类(已去重)")
-    public ResponseHelper<List<RpProjectRepairProduct>> main(
-            @ApiParam(value = "维保id",required = true) @RequestParam String repairProjectId,
-            @ApiParam(value = "品牌id",required = false) @RequestParam String brandId
-    ){
-        List<RpProjectRepairProduct> mains = projectRepairLogic.main(repairProjectId, brandId);
-        return ResponseHelper.success(mains);
-    }
-
-    @PostMapping("/small")
-    @ApiOperation("工程维保-小类(已去重)")
-    public ResponseHelper<List<RpProjectRepairProduct>> small(
-            @ApiParam(value = "维保id",required = true) @RequestParam String repairProjectId,
-            @ApiParam(value = "品牌id",required = false) @RequestParam(required = false) String brandId,
-            @ApiParam(value = "大类id",required = false) @RequestParam(required = false) String mainId
-    ){
-        List<RpProjectRepairProduct> small = projectRepairLogic.small(repairProjectId, brandId, mainId);
-        return ResponseHelper.success(small);
-    }
-
-
-//
-//    @PostMapping("/product/save")
-//    @ApiOperation(value = "工程维保-设备编辑")
-//    public ResponseHelper productSave(
-//            @RequestBody RpProjectRepairProduct product
-//    ) throws Exception {
-//
-//        projectRepairLogic.productSave(product);
-//
-//        return ResponseHelper.success();
-//    }
-//
-//    @PostMapping("/product/del")
-//    @ApiOperation(value = "工程维保-设备删除")
-//    public ResponseHelper productDel(
-//            @ApiParam(value = "工程维保id", required = true) @RequestParam String projectRepairId,
-//            @ApiParam(value = "明细id", required = true) @RequestParam String id
-//    ) throws Exception {
-//
-//        projectRepairLogic.productDel(projectRepairId, id);
-//
-//        return ResponseHelper.success();
-//    }
-//
-//    @PostMapping("/by/save")
-//    @ApiOperation(value = "工程维保-人员编辑")
-//    public ResponseHelper bySave(
-//            @RequestBody RpProjectRepairBy product
-//    ) throws Exception {
-//
-//        projectRepairLogic.bySave(product);
-//
-//        return ResponseHelper.success();
-//    }
-//
-//    @PostMapping("/by/del")
-//    @ApiOperation(value = "工程维保-人员删除")
-//    public ResponseHelper byDel(
-//            @ApiParam(value = "工程维保id", required = true) @RequestParam String projectRepairId,
-//            @ApiParam(value = "明细id", required = true) @RequestParam String id
-//    ) throws Exception {
-//
-//        projectRepairLogic.byDel(projectRepairId, id);
-//
-//        return ResponseHelper.success();
-//    }
-//
-//    @PostMapping("/websit/save")
-//    @ApiOperation(value = "工程维保-网点编辑")
-//    public ResponseHelper websitSave(
-//            @RequestBody RpProjectRepairWebsit websit
-//    ) throws Exception {
-//
-//        projectRepairLogic.websitSave(websit);
-//
-//        return ResponseHelper.success();
-//    }
-//
-//    @PostMapping("/websit/del")
-//    @ApiOperation(value = "工程维保-网点删除")
-//    public ResponseHelper websitDel(
-//            @ApiParam(value = "工程维保id", required = true) @RequestParam String projectRepairId,
-//            @ApiParam(value = "明细id", required = true) @RequestParam String id
-//    ) throws Exception {
-//
-//        projectRepairLogic.websitDel(projectRepairId, id);
-//
-//        return ResponseHelper.success();
-//    }
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/engin/RpMaterialController.java

@@ -1,238 +0,0 @@
-package com.gree.mall.manager.controller.engin;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.engin.*;
-import com.gree.mall.manager.bean.websit.WorkerSettlementVO;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.engin.ProjectRepairLogic;
-import com.gree.mall.manager.logic.engin.RpMaterialLogic;
-import com.gree.mall.manager.plus.entity.RpMaterialOrder;
-import com.gree.mall.manager.plus.entity.RpProjectRepairBy;
-import com.gree.mall.manager.plus.entity.RpProjectRepairProduct;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-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 javax.servlet.http.HttpServletResponse;
-import java.text.ParseException;
-import java.util.List;
-
-@Slf4j
-@RestController
-@Api(value = "工程维保费用记录", tags = {"工程维保费用记录"})
-@RequestMapping(value = "/engin/material", produces = "application/json; charset=utf-8")
-public class RpMaterialController {
-
-    @Resource
-    RpMaterialLogic rpMaterialLogic;
-
-    @ZfireList
-    @PostMapping("/list/pageSettlementV2")
-    @ApiOperation(value = "工程维保线下汇总列表")
-    public ResponseHelper<IPage<WorkerMaterialSettlementVO>> pageSettlementV2(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<WorkerMaterialSettlementVO> page = rpMaterialLogic.workerSettlementPageV2(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<WorkerMaterialSettlementVO>() {});
-    }
-
-    @PostMapping("/pageSettlementExport")
-    @ApiOperation(value = "工程维保线下汇总列表导出")
-    public void pageSettlementExport(@RequestBody ZfireParamBean zfireParamBean, HttpServletRequest request, HttpServletResponse response) throws Exception {
-        //1.组装查询条件
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
-        //2.查询要导出的内容
-        IPage<WorkerMaterialSettlementVO> page = rpMaterialLogic.workerSettlementPageV2(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(page.getRecords(), zfireParam.getExportFields(), request, response);
-    }
-
-
-
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "工程维保费用记录-列表")
-    public ResponseHelper<Page<RpMaterialOrderVO>> list(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<RpMaterialOrderVO> vo = rpMaterialLogic.list(zfireParamBean);
-        return ResponseHelper.success(vo, new TypeReference<RpMaterialOrderVO>() {});
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation(value = "工程维保费用记录-导出")
-    public void listExport(@RequestBody ZfireParamBean zfireParamBean, HttpServletRequest request, HttpServletResponse response) throws Exception {
-        //1.组装查询条件
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
-        //2.查询要导出的内容
-        IPage<RpMaterialOrderVO> page = rpMaterialLogic.list(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(page.getRecords(), zfireParam.getExportFields(), request, response);
-    }
-
-    @ZfireList
-    @PostMapping("/listAll")
-    @ApiOperation(value = "工程维保费用记录全包-列表")
-    public ResponseHelper<Page<RpMaterialOrderAllListVO>> listAll(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<RpMaterialOrderAllListVO> vo = rpMaterialLogic.listAll(zfireParamBean);
-        return ResponseHelper.success(vo, new TypeReference<RpMaterialOrderVO>() {});
-    }
-
-    @PostMapping("/listAll/export")
-    @ApiOperation(value = "工程维保费用记录全包-导出")
-    public void listAllExport(@RequestBody ZfireParamBean zfireParamBean, HttpServletRequest request, HttpServletResponse response) throws Exception {
-        //1.组装查询条件
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
-        //2.查询要导出的内容
-        IPage<RpMaterialOrderAllListVO> page = rpMaterialLogic.listAll(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(page.getRecords(), zfireParam.getExportFields(), request, response);
-    }
-
-    @ZfireList
-    @PostMapping("/listWechat")
-    @ApiOperation(value = "工程维保费用记录-微信列表")
-    public ResponseHelper<Page<RpMaterialOrderWechatVO>> listWechat(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<RpMaterialOrderWechatVO> vo = rpMaterialLogic.listWechat(zfireParamBean);
-        return ResponseHelper.success(vo, new TypeReference<RpMaterialOrderVO>() {});
-    }
-
-    @PostMapping("/listWechat/export")
-    @ApiOperation(value = "工程维保费用记录微信列表-导出")
-    public void listWechatExport(@RequestBody ZfireParamBean zfireParamBean, HttpServletRequest request, HttpServletResponse response) throws Exception {
-        //1.组装查询条件
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
-        //2.查询要导出的内容
-        IPage<RpMaterialOrderWechatVO> page = rpMaterialLogic.listWechat(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(page.getRecords(), zfireParam.getExportFields(), request, response);
-    }
-
-    @ZfireList
-    @PostMapping("/listLine")
-    @ApiOperation(value = "工程维保费用记录线下-列表")
-    public ResponseHelper<Page<RpMaterialOrderLineVO>> listLine(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<RpMaterialOrderLineVO> vo = rpMaterialLogic.listLine(zfireParamBean);
-        return ResponseHelper.success(vo, new TypeReference<RpMaterialOrderVO>() {});
-    }
-
-    @PostMapping("/listLine/export")
-    @ApiOperation(value = "工程维保费用记录线下-导出")
-    public void listLineExport(@RequestBody ZfireParamBean zfireParamBean, HttpServletRequest request, HttpServletResponse response) throws Exception {
-        //1.组装查询条件
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
-        //2.查询要导出的内容
-        IPage<RpMaterialOrderLineVO> page = rpMaterialLogic.listLine(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(page.getRecords(), zfireParam.getExportFields(), request, response);
-    }
-
-
-
-    @PostMapping("/lineSettlement")
-    @ApiOperation("线下结算")
-    public ResponseHelper lineSettlement(
-            @ApiParam(value = "结算id" , required = true) @RequestParam(required = true) List<String> id,
-            HttpServletRequest request
-    ) throws ParseException {
-        rpMaterialLogic.lineSettlement(id);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/lineSettlementHui")
-    @ApiOperation("汇总批量线下结算")
-    public ResponseHelper lineSettlementHui(
-            @ApiParam(value = "workerId" , required = true) @RequestParam(required = true) String workerId,
-            @ApiParam(value = "workerId" , required = true) @RequestParam(required = true) String websitId,
-            HttpServletRequest request
-    ) throws ParseException {
-        rpMaterialLogic.lineSettlementHui(workerId,websitId);
-        return ResponseHelper.success();
-    }
-
-
-
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "工程维保费用记录-详情")
-    public ResponseHelper<RpmaterialOrderDetail> detail(
-            @ApiParam(value = "申请单号",required = true) @RequestParam(required = true) String id
-
-    ) throws Exception {
-
-        RpmaterialOrderDetail rpmaterialOrderDetail = rpMaterialLogic.detail(id);
-
-        return ResponseHelper.success(rpmaterialOrderDetail);
-    }
-
-    @PostMapping("/examine")
-    @ApiOperation(value = "工程维保费用记录-审批")
-    public ResponseHelper examine(
-            @ApiParam(value = "申请单号",required = true) @RequestParam(required = true) String id,
-            @ApiParam(value = "审批状态 WAIT 待审 OK 审批  FAIL 驳回  PAID 现场支付 NO 取消 NO_PAID 未支付",required = true) @RequestParam(required = true) String examineStatus,
-            @ApiParam(value = "审批备注",required = false) @RequestParam(required = false) String examineRemark
-
-            ) throws Exception {
-
-        rpMaterialLogic.examine(id,examineRemark,examineStatus);
-
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("/isBy")
-    @ApiOperation(value = "用工程维保费用记录-是否可以审批")
-    public ResponseHelper<Boolean> isBy(
-
-            @ApiParam(value = "工单号",required = true) @RequestParam(required = true) String orderBaserId
-
-    ) throws Exception {
-
-        Boolean isBy = rpMaterialLogic.isBy(orderBaserId);
-
-        return ResponseHelper.success(isBy);
-    }
-
-    @PostMapping("/cancel")
-    @ApiOperation(value = "工程维保费用记录-取消")
-    public ResponseHelper cancel(
-            @ApiParam(value = "申请单号",required = true) @RequestParam(required = true) String id
-
-    ) throws Exception {
-
-        rpMaterialLogic.cancel(id);
-
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/detailWorker")
-    @ApiOperation(value = "工程维保费用记录详情-电子支付列表")
-    public ResponseHelper<List<RpMaterialOrderAllVO>> detailWorker(
-            @ApiParam(value = "工单号", required = true)   @RequestParam(required = true) String workerOrderId
-
-
-    ) throws RemoteServiceException {
-        List<RpMaterialOrderAllVO> rpMaterialOrder = rpMaterialLogic.detailWorker(workerOrderId);
-        return ResponseHelper.success(rpMaterialOrder);
-    }
-
-
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/es/ESGoodsController.java

@@ -1,135 +0,0 @@
-package com.gree.mall.manager.controller.es;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.es.ESGoodsBean;
-import com.gree.mall.manager.bean.es.ESGoodsVO;
-import com.gree.mall.manager.enums.es.ESGoodsStatusEnum;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.es.ESGoodsLogic;
-import com.gree.mall.manager.plus.entity.EsGoodsOperateRecord;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-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 javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-@Slf4j
-@RestController
-@Api(value = "二手商品API", tags ={"二手商品API"} )
-@RequestMapping(value = "/es/goods", produces = "application/json; charset=utf-8")
-public class ESGoodsController {
-
-    @Resource
-    ESGoodsLogic esGoodsLogic;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "二手商品-列表")
-    public ResponseHelper<IPage<ESGoodsVO>> list(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<ESGoodsVO> page = esGoodsLogic.list(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<ESGoodsVO>() {});
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation("二手商品-导出")
-    public void listExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<ESGoodsVO> baseVOIPage = esGoodsLogic.list(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "二手商品-详情")
-    public ResponseHelper<ESGoodsBean> detail(
-            @ApiParam(value = "id", required = true) @RequestParam String id
-    ) throws RemoteServiceException {
-        return ResponseHelper.success(esGoodsLogic.detail(id));
-    }
-
-    @PostMapping("/update")
-    @ApiOperation(value = "二手商品-修改")
-    public ResponseHelper update(
-            @RequestBody ESGoodsBean bean
-    ) throws Exception {
-        esGoodsLogic.update(bean);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/batch/update/status")
-    @ApiOperation(value = "二手商品-批量更新状态")
-    public ResponseHelper batchUpdateStatus(
-            @ApiParam(value = "id", required = true) @RequestParam List<String> ids,
-            @ApiParam(value = "ON=上架 OFF=下架 SALE=已卖出", required = true) @RequestParam ESGoodsStatusEnum status
-    ) throws Exception {
-        if (status.getKey().equals(ESGoodsStatusEnum.SALE.getKey())) {
-            throw new RemoteServiceException("接口暂不支持“已卖出”状态");
-        }
-        esGoodsLogic.batchUpdateStatus(ids, status);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/del")
-    @ApiOperation(value = "二手商品-删除")
-    public ResponseHelper del(
-            @ApiParam(value = "id", required = true) @RequestParam String id
-    ) throws Exception {
-        esGoodsLogic.del(id);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/copy")
-    @ApiOperation(value = "二手商品-克隆")
-    public ResponseHelper<String> copy(
-            @ApiParam(value = "id", required = true) @RequestParam String id
-    ) throws Exception {
-        String newId = esGoodsLogic.copy(id);
-        return ResponseHelper.success(newId);
-    }
-
-    @PostMapping("/top")
-    @ApiOperation(value = "二手商品-置顶")
-    public ResponseHelper copy(
-            @ApiParam(value = "id", required = true) @RequestParam String id,
-            @ApiParam(value = "是否置顶 true=是 false=否", required = true) @RequestParam Boolean isTop
-    ) throws Exception {
-        esGoodsLogic.top(id, isTop);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/reply")
-    @ApiOperation(value = "二手商品-回复")
-    public ResponseHelper reply(
-            @ApiParam(value = "id", required = true) @RequestParam String id,
-            @ApiParam(value = "留言id", required = true) @RequestParam String messageId,
-            @ApiParam(value = "回复内容", required = true) @RequestParam String content
-    ) throws Exception {
-        esGoodsLogic.reply(id, messageId, content);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/operate/list")
-    @ApiOperation(value = "二手商品-操作记录列表")
-    public ResponseHelper<List<EsGoodsOperateRecord>> operateList(
-            @ApiParam(value = "id", required = true) @RequestParam String id
-    ) {
-        List<EsGoodsOperateRecord> page = esGoodsLogic.operateList(id);
-        return ResponseHelper.success(page);
-    }
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/es/EsCountController.java

@@ -1,65 +0,0 @@
-package com.gree.mall.manager.controller.es;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.bean.count.CountOrderBean;
-import com.gree.mall.manager.bean.count.EsCountBean;
-import com.gree.mall.manager.bean.count.EsGoodsRankBean;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.es.EsCountLogic;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.RequiredArgsConstructor;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-@RequiredArgsConstructor
-@Validated
-@RestController
-@Api(value = "二手首页统计", tags ={"二手首页统计"} )
-@RequestMapping("es/count")
-public class EsCountController {
-
-
-    private final EsCountLogic esCountLogic;
-
-    @GetMapping("/info")
-    @ApiOperation(value = "概况-统计1")
-    public ResponseHelper<EsCountBean> info(HttpServletRequest request) {
-        EsCountBean info = esCountLogic.info();
-        return ResponseHelper.success(info);
-    }
-
-
-    @GetMapping("/order")
-    @ApiOperation(value = "交易概述-统计2")
-    public ResponseHelper<CountOrderBean> order(
-            @ApiParam(value ="时间类型(1=今天，2=昨日，3=最近7天，4=本月)",required = true) @RequestParam Integer flag,
-            HttpServletRequest request
-    ) {
-        CountOrderBean order = esCountLogic.order(flag);
-        return ResponseHelper.success(order);
-    }
-
-    @GetMapping("/goods/rank")
-    @ApiOperation(value = "商品销量排行-统计3")
-    public ResponseHelper<IPage<EsGoodsRankBean>> goodsRank(
-            @ApiParam(value = "时间类型(1=今天，2=昨日，3=最近7天，4=本月)",required = true) @RequestParam Integer flag,
-            @RequestParam Integer pageNum,
-            @RequestParam Integer pageSize,
-            HttpServletRequest request
-    ) {
-        IPage<EsGoodsRankBean> goodsRankBeans = esCountLogic.countGoodsRank(flag,pageNum,pageSize);
-        return ResponseHelper.success(goodsRankBeans);
-    }
-
-
-
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/esOrder/EsOrderController.java

@@ -1,283 +0,0 @@
-package com.gree.mall.manager.controller.esOrder;
-
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.github.binarywang.wxpay.exception.WxPayException;
-import com.gree.mall.manager.bean.esOrder.EsOrderAddBean;
-import com.gree.mall.manager.bean.esOrder.EsOrderRefundBean;
-import com.gree.mall.manager.bean.material.manage.PartsApplyBean;
-import com.gree.mall.manager.bean.order.BatchRemarkBean;
-import com.gree.mall.manager.bean.order.OrderDetailBean;
-import com.gree.mall.manager.bean.order.SendOrderBody;
-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.EsOrder.EsOrderLogic;
-import com.gree.mall.manager.logic.ExpressLogic;
-import com.gree.mall.manager.logic.order.OrderLogic;
-import com.gree.mall.manager.plus.entity.*;
-import com.gree.mall.manager.utils.CommonUtils;
-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.integration.redis.util.RedisLockRegistry;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-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;
-
-@Slf4j
-@RestController
-@Api(value = "二手订单管理", tags = {"二手订单管理"})
-@RequestMapping(value = "/esOrder", produces = "application/json; charset=utf-8")
-public class EsOrderController {
-
-    @Autowired
-    EsOrderLogic esOrderLogic;
-
-    @Autowired
-    ExpressLogic expressLogic;
-
-
-
-    @PostMapping("/list")
-    @ApiOperation("列表")
-    public ResponseHelper<Page<EsOrderInfo>> list(
-            @ApiParam(value = "订单号", required = false) @RequestParam(required = false) String orderId,
-            @ApiParam(value = "产品名称", required = false) @RequestParam(required = false) String esGoodsName,
-            @ApiParam(value = "买家名称", required = false) @RequestParam(required = false) String userName,
-            @ApiParam(value = "卖家名称", required = false) @RequestParam(required = false) String sellName,
-            @ApiParam(value = "买家手机", required = false) @RequestParam(required = false) String userMobile,
-            @ApiParam(value = "卖家手机", required = false) @RequestParam(required = false) String sellMobile,
-            @ApiParam(value = "订单状态 SAVE 买家下单 WAIT 待确认  PAID 待发货 SEND 卖家发货  OVER 交易完成 TIME_OUT 超时 CANCEL 取消  WAIT_REFUND 售后中 REFUND 已退", required = false) @RequestParam(required = false) List<String> status,
-            @ApiParam(value = "开始创建时间", required = false) @RequestParam(required = false) String startCreateTime,
-            @ApiParam(value = "结束创建时间", required = false) @RequestParam(required = false) String endCreateTime,
-            @ApiParam(value = "开始支付时间", required = false) @RequestParam(required = false) String startPayTime,
-            @ApiParam(value = "结束支付时间", required = false) @RequestParam(required = false) String endPayTime,
-            @ApiParam(value = "页号", required = true) @RequestParam(required = true) Integer pageNum,
-            @ApiParam(value = "页大小", required = true) @RequestParam(required = true) Integer pageSize,
-
-            HttpServletRequest request
-    ) throws RemoteServiceException {
-        IPage<EsOrderInfo> list = esOrderLogic
-                .list(request,esGoodsName,orderId, sellName, userName, userMobile,sellMobile, status, startCreateTime,
-                        endCreateTime, startPayTime, endPayTime,pageNum, pageSize);
-        return ResponseHelper.success(list);
-    }
-
-
-    @GetMapping("/listExcel")
-    @ApiOperation("订单导出")
-    public void downloadFile (HttpServletResponse response,
-            @ApiParam(value = "订单号", required = false) @RequestParam(required = false) String orderId,
-            @ApiParam(value = "产品名称", required = false) @RequestParam(required = false) String esGoodsName,
-            @ApiParam(value = "买家名称", required = false) @RequestParam(required = false) String userName,
-            @ApiParam(value = "卖家名称", required = false) @RequestParam(required = false) String sellName,
-            @ApiParam(value = "买家手机", required = false) @RequestParam(required = false) String userMobile,
-            @ApiParam(value = "卖家手机", required = false) @RequestParam(required = false) String sellMobile,
-            @ApiParam(value = "订单状态 SAVE 买家下单 WAIT 待确认  PAID 待发货 SEND 卖家发货  OVER 交易完成 TIME_OUT 超时 CANCEL 取消  WAIT_REFUND 售后中 REFUND 已退", required = false) @RequestParam(required = false) List<String> status,
-            @ApiParam(value = "开始创建时间", required = false) @RequestParam(required = false) String startCreateTime,
-            @ApiParam(value = "结束创建时间", required = false) @RequestParam(required = false) String endCreateTime,
-            @ApiParam(value = "开始支付时间", required = false) @RequestParam(required = false) String startPayTime,
-            @ApiParam(value = "结束支付时间", required = false) @RequestParam(required = false) String endPayTime,
-
-
-            HttpServletRequest request
-    ) throws Exception {
-        esOrderLogic.export2( request,  response,esGoodsName,orderId, sellName, userName, userMobile,sellMobile, status, startCreateTime,
-                endCreateTime, startPayTime, endPayTime);
-    }
-
-
-
-    @PostMapping("/detail")
-    @ApiOperation("订单详情")
-    public ResponseHelper<EsOrderInfo> detail(
-            @ApiParam(value = "订单号", required = true) @RequestParam(required = true) String esOrderId
-    ) {
-        EsOrderInfo detail = esOrderLogic.detail(esOrderId);
-        return ResponseHelper.success(detail);
-    }
-
-    @GetMapping("/express")
-    @ApiOperation(value = "查看物流")
-    public ResponseHelper<List<ExpressInfo>> express(
-            @ApiParam(required = true, value = "物流单号") @RequestParam(required = true) String logisticsNo,
-            @ApiParam(required = true, value = "物流公司code") @RequestParam(required = true) String companyCode
-    ) throws IOException, RemoteServiceException {
-        List<ExpressInfo> expressInfos = expressLogic.queryExpress(logisticsNo,companyCode);
-        return ResponseHelper.success(expressInfos);
-    }
-
-
-    @PostMapping("/add")
-    @ApiOperation("新增订单")
-    public ResponseHelper add(
-            @RequestBody EsOrderAddBean esOrderAddBean
-    ) {
-        esOrderLogic.add(esOrderAddBean);
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("/payPrice")
-    @ApiOperation("线上单确认收款")
-    public ResponseHelper payPrice(
-            @ApiParam(value = "订单号", required = true) @RequestParam(required = true) String esOrderId,
-            @ApiParam(value = "金额", required = false) @RequestParam(required = false) BigDecimal price,
-            @ApiParam(value = "收款凭证", required = false) @RequestParam(required = false) String fileUrl,
-            @ApiParam(value = "备注", required = false) @RequestParam(required = false) String remark
-    ) {
-        esOrderLogic.payPrice(esOrderId,price,fileUrl,remark);
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("/payOk")
-    @ApiOperation("线下单确认订单")
-    public ResponseHelper payPrice(
-            @ApiParam(value = "订单号", required = true) @RequestParam(required = true) String esOrderId
-    ) {
-        esOrderLogic.payOk(esOrderId);
-        return ResponseHelper.success();
-    }
-
-
-
-
-    @PostMapping("/cancel")
-    @ApiOperation("取消订单")
-    public ResponseHelper cancel(
-            @ApiParam(value = "订单号", required = true) @RequestParam(required = true) String esOrderId
-
-    ) {
-        esOrderLogic.cancel(esOrderId);
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("/payPriceList")
-    @ApiOperation("线下单确认收款记录")
-    public ResponseHelper<List<EsOrderPrice>> payPriceList(
-            @ApiParam(value = "订单号", required = true) @RequestParam(required = true) String esOrderId
-    ) {
-        List<EsOrderPrice> esOrderPrices = esOrderLogic.payPriceList(esOrderId);
-        return ResponseHelper.success(esOrderPrices);
-    }
-
-
-    @PostMapping("/send")
-    @ApiOperation("发货")
-    public ResponseHelper send(
-            @ApiParam(value = "订单号", required = true) @RequestParam(required = true) String esOrderId,
-            @ApiParam(value = "是否自提 YES是 NO否", required = true) @RequestParam(required = true) String pickType,
-            @ApiParam(value = "快递单号", required = false) @RequestParam(required = false) String logisticsNo,
-            @ApiParam(value = "快递公司code", required = false) @RequestParam(required = false) String logisticsCode,
-            @ApiParam(value = "快递公司名称", required = false) @RequestParam(required = false) String logisticsName
-    ) {
-        esOrderLogic.send(esOrderId,pickType,logisticsNo,logisticsCode,logisticsName);
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("/refund")
-    @ApiOperation("发起退款")
-    public ResponseHelper refund(
-            @ApiParam(value = "订单号", required = true) @RequestParam(required = true) String esOrderId,
-            @ApiParam(value = "处理方式 REFUND 退款  GOODS_REFUND 退货退款  FAIL 驳回 GOODS 退货", required = true) @RequestParam(required = true) String refundType,
-            @ApiParam(value = "退货数量", required = false) @RequestParam(required = false) Integer refundNum,
-            @ApiParam(value = "退货备注", required = false) @RequestParam(required = false) String refundRemark,
-            @ApiParam(value = "退款金额", required = false) @RequestParam(required = false) BigDecimal refundPrice
-    ) {
-        esOrderLogic.refund(esOrderId,refundType,refundNum,refundRemark,refundPrice);
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("/listRefund")
-    @ApiOperation("退货列表")
-    public ResponseHelper<Page<EsOrderRefund>> listRefund(
-            @ApiParam(value = "订单号", required = false) @RequestParam(required = false) String orderId,
-            @ApiParam(value = "售后编号", required = false) @RequestParam(required = false) String esOrderRefundId,
-            @ApiParam(value = "产品名称", required = false) @RequestParam(required = false) String esGoodsName,
-            @ApiParam(value = "买家名称", required = false) @RequestParam(required = false) String userName,
-            @ApiParam(value = "卖家名称", required = false) @RequestParam(required = false) String sellName,
-            @ApiParam(value = "买家手机", required = false) @RequestParam(required = false) String userMobile,
-            @ApiParam(value = "卖家手机", required = false) @RequestParam(required = false) String sellMobile,
-            @ApiParam(value = "处理方式 REFUND 退款  GOODS_REFUND 退货退款  FAIL 驳回 GOODS 退货", required = false) @RequestParam(required = false) List<String> status,
-            @ApiParam(value = "开始创建时间", required = false) @RequestParam(required = false) String startCreateTime,
-            @ApiParam(value = "结束创建时间", required = false) @RequestParam(required = false) String endCreateTime,
-            @ApiParam(value = "开始支付时间", required = false) @RequestParam(required = false) String startPayTime,
-            @ApiParam(value = "结束支付时间", required = false) @RequestParam(required = false) String endPayTime,
-            @ApiParam(value = "页号", required = true) @RequestParam(required = true) Integer pageNum,
-            @ApiParam(value = "页大小", required = true) @RequestParam(required = true) Integer pageSize,
-
-            HttpServletRequest request
-    ) throws RemoteServiceException {
-        IPage<EsOrderRefund> list = esOrderLogic
-                .listRefund(request,esOrderRefundId,esGoodsName,orderId, sellName, userName, userMobile,sellMobile, status, startCreateTime,
-                        endCreateTime, startPayTime, endPayTime,pageNum, pageSize);
-        return ResponseHelper.success(list);
-    }
-
-
-    @PostMapping("/detailRefund")
-    @ApiOperation("退货订单详情")
-    public ResponseHelper<EsOrderRefundBean> detailRefund(
-            @ApiParam(value = "退货单号", required = true) @RequestParam(required = true) String esOrderRefundId
-    ) {
-        EsOrderRefundBean detail = esOrderLogic.detailRefund(esOrderRefundId);
-        return ResponseHelper.success(detail);
-    }
-
-
-
-    @PostMapping("/refundPrice")
-    @ApiOperation("退款确认")
-    public ResponseHelper refundPrice(
-            @ApiParam(value = "订单号", required = true) @RequestParam(required = true) String esOrderRefundId,
-            @ApiParam(value = "处理方式 REFUND 退款  GOODS_REFUND 退货退款  FAIL 驳回 GOODS 退货", required = true) @RequestParam(required = true) String refundType,
-            @ApiParam(value = "退货数量", required = false) @RequestParam(required = false) Integer refundNum,
-            @ApiParam(value = "退货备注", required = false) @RequestParam(required = false) String refundRemark,
-            @ApiParam(value = "退款金额", required = false) @RequestParam(required = false) BigDecimal refundPrice
-    ) {
-        esOrderLogic.refundPrice(esOrderRefundId,refundType,refundNum,refundRemark,refundPrice);
-        return ResponseHelper.success();
-    }
-
-
-    @GetMapping("/listExcelRefund")
-    @ApiOperation("维权订单导出")
-    public void downloadFileRefund (HttpServletResponse response,
-                                    @ApiParam(value = "订单号", required = false) @RequestParam(required = false) String orderId,
-                                    @ApiParam(value = "产品名称", required = false) @RequestParam(required = false) String esGoodsName,
-                                    @ApiParam(value = "买家名称", required = false) @RequestParam(required = false) String userName,
-                                    @ApiParam(value = "卖家名称", required = false) @RequestParam(required = false) String sellName,
-                                    @ApiParam(value = "买家手机", required = false) @RequestParam(required = false) String userMobile,
-                                    @ApiParam(value = "卖家手机", required = false) @RequestParam(required = false) String sellMobile,
-                                    @ApiParam(value = "处理方式 REFUND 退款  GOODS_REFUND 退货退款  FAIL 驳回 GOODS 退货", required = false) @RequestParam(required = false) List<String> status,
-                                    @ApiParam(value = "开始创建时间", required = false) @RequestParam(required = false) String startCreateTime,
-                                    @ApiParam(value = "结束创建时间", required = false) @RequestParam(required = false) String endCreateTime,
-                                    @ApiParam(value = "开始支付时间", required = false) @RequestParam(required = false) String startPayTime,
-                                    @ApiParam(value = "结束支付时间", required = false) @RequestParam(required = false) String endPayTime,
-
-
-                              HttpServletRequest request
-    ) throws Exception {
-        esOrderLogic.downloadFileRefund( request,  response,esGoodsName,orderId, sellName, userName, userMobile,sellMobile, status, startCreateTime,
-                endCreateTime, startPayTime, endPayTime);
-    }
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/exchange/ExchangeCodeController.java

@@ -1,92 +0,0 @@
-package com.gree.mall.manager.controller.exchange;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.bean.ExcelData;
-import com.gree.mall.manager.bean.coupon.CouponDetailBean;
-import com.gree.mall.manager.bean.exchange.GiftExchangeCodeBean;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.exchange.ExchangeLogic;
-import com.gree.mall.manager.plus.entity.GiftExchangeCode;
-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.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-@Slf4j
-@RestController
-@Api(value = "兑换码API", tags ={"兑换码API"} )
-@RequestMapping(value = "/exchange/code", produces = "application/json; charset=utf-8")
-public class ExchangeCodeController {
-
-    @Autowired
-    ExchangeLogic exchangeLogic;
-
-    @GetMapping("/count/list")
-    @ApiOperation(value = "统计列表")
-    public ResponseHelper<IPage<GiftExchangeCodeBean>> countList(
-            @ApiParam(value = "昵称/电话",required = false) @RequestParam(required = false) String keyword,
-            @ApiParam(value = "网点主键id",required = false) @RequestParam(required = false) String adminWebsitId,
-            @ApiParam(value = "pageNo",required = false) @RequestParam(required = false) Integer pageNo,
-            @ApiParam(value = "pageSize",required = false) @RequestParam(required = false) Integer pageSize,
-            HttpServletRequest request
-    ) throws RemoteServiceException {
-        IPage<GiftExchangeCodeBean> giftExchangeCodeBeanIPage = exchangeLogic.queryExchangeCodeCountList(keyword, adminWebsitId, pageNo, pageSize, request);
-        return ResponseHelper.success(giftExchangeCodeBeanIPage);
-    }
-
-    @GetMapping("/count/export")
-    @ApiOperation(value = "统计列表导出")
-    public void exportData(
-            @ApiParam(value = "昵称/电话",required = false) @RequestParam(required = false) String keyword,
-            @ApiParam(value = "网点主键id",required = false) @RequestParam(required = false) String adminWebsitId,
-            HttpServletRequest request,HttpServletResponse response
-    ) throws Exception {
-        IPage<GiftExchangeCodeBean> giftExchangeCodeBeanIPage = exchangeLogic.queryExchangeCodeCountList(keyword, adminWebsitId, 1, -1, request);
-        ExcelData excelData = exchangeLogic.exportCountData(giftExchangeCodeBeanIPage.getRecords());
-        ExcelUtils.exportExcel(request,response,"record.xlsx",excelData);
-    }
-
-
-    @GetMapping("/list")
-    @ApiOperation(value = "列表")
-    public ResponseHelper<IPage<GiftExchangeCode>> list(
-            @ApiParam(value = "id",required = true) @RequestParam(required = true) String id,
-            @ApiParam(value = "用户id",required = true) @RequestParam(required = true) String userId,
-            @ApiParam(value = "订单号",required = false) @RequestParam(required = false) String orderId,
-            @ApiParam(value = "状态 1=已使用 0=未使用",required = false) @RequestParam(required = false) Integer status,
-            @ApiParam(value = "pageNo",required = false) @RequestParam(required = false) Integer pageNo,
-            @ApiParam(value = "pageSize",required = false) @RequestParam(required = false) Integer pageSize,
-            HttpServletRequest request
-    ) throws RemoteServiceException {
-        IPage<GiftExchangeCode> list = exchangeLogic.list(id,userId, orderId, status, pageNo, pageSize, request);
-        return ResponseHelper.success(list);
-    }
-
-    @GetMapping("/export")
-    @ApiOperation(value = "导出")
-    public void exportData(
-            @ApiParam(value = "id",required = true) @RequestParam(required = true) String id,
-            @ApiParam(value = "用户id",required = true) @RequestParam(required = true) String userId,
-            @ApiParam(value = "订单号",required = false) @RequestParam(required = false) String orderId,
-            @ApiParam(value = "状态 1=已使用 0=未使用",required = false) @RequestParam(required = false) Integer status,
-            HttpServletRequest request,HttpServletResponse response
-    ) throws Exception {
-        IPage<GiftExchangeCode> list = exchangeLogic.list(id,userId, orderId, status, 1, -1, request);
-        ExcelData excelData = exchangeLogic.exportData(list.getRecords());
-        ExcelUtils.exportExcel(request,response,"record.xlsx",excelData);
-    }
-
-
-
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/fadada/ContractCommonController.java

@@ -1,37 +0,0 @@
-package com.gree.mall.manager.controller.fadada;
-
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.utils.fadada.Auth4FDDUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@Api(value = "法大大通用API", tags ={"法大大通用API"} )
-@RequestMapping("/fdd/common")
-public class ContractCommonController {
-
-    @PostMapping("/view/template")
-    @ApiOperation(value = "查看模板")
-    public ResponseHelper<String> viewTemplate(@RequestParam String templateId) {
-        String url = Auth4FDDUtil.queryContractTemplate(templateId);
-        return ResponseHelper.success(url);
-    }
-
-    @PostMapping("/view/contract")
-    @ApiOperation(value = "查看合同")
-    public ResponseHelper<String> viewContract(@RequestParam String contractId) {
-        String url = Auth4FDDUtil.viewContract(contractId);
-        return ResponseHelper.success(url);
-    }
-
-    @PostMapping("/download/contract")
-    @ApiOperation(value = "下载合同")
-    public ResponseHelper<String> downloadContract(@RequestParam String contractId) {
-        String url = Auth4FDDUtil.downloadContract(contractId);
-        return ResponseHelper.success(url);
-    }
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/fadada/NotifyController.java

@@ -1,85 +0,0 @@
-package com.gree.mall.manager.controller.fadada;
-
-import com.gree.mall.manager.annotation.ApiNotAuth;
-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.fadada.FDDNotifyLogic;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import org.springframework.integration.redis.util.RedisLockRegistry;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-
-@RequiredArgsConstructor
-@RestController
-@Api(value = "法大大回调通知API", tags ={"法大大回调通知API"} )
-@RequestMapping("/fdd/notify")
-public class NotifyController {
-
-    private final FDDNotifyLogic fddNotifyLogic;
-    private final RedisLockRegistry redisLockRegistry;
-
-    @ApiNotAuth
-    @RequestMapping("/company/ca/auth")
-    @ApiOperation(value = "CA实名企业认证回调")
-    public ResponseHelper<String> caCompanyAuthResultPost(@RequestParam Map<String, String> params) throws Exception {
-        fddNotifyLogic.caCompanyAuthResult(params);
-        return ResponseHelper.success();
-    }
-
-    @ApiNotAuth
-    @RequestMapping("/company/ca/auth/auto")
-    @ApiOperation(value = "CA实名企业授权自动签回调")
-    public ResponseHelper<String> caCompanyAuthAutoResultPost(@RequestParam Map<String, String> params) throws Exception {
-        fddNotifyLogic.caCompanyAuthAutoResult(params);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/find/company/auth/result")
-    @ApiOperation(value = "CA实名企业结果查询")
-    public ResponseHelper<String> findCompanyAuthResult(@RequestParam String transactionNo) throws Exception {
-        fddNotifyLogic.queryCACompanyAuthResult(transactionNo);
-        return ResponseHelper.success();
-    }
-
-    @ApiNotAuth
-    @RequestMapping("/websit/auth")
-    @ApiOperation(value = "实名网点认证回调")
-    public ResponseHelper<String> websitAuthResultPost(@RequestParam Map<String, String> params) throws Exception {
-        fddNotifyLogic.websitAuthResult(params);
-        return ResponseHelper.success();
-    }
-
-    @ApiNotAuth
-    @RequestMapping("/websit/person")
-    @ApiOperation(value = "实名网点个人认证回调")
-    public ResponseHelper<String> websitPersonAuthResultPost(@RequestParam Map<String, String> params) throws Exception {
-        fddNotifyLogic.websitPersonAuthResul(params);
-        return ResponseHelper.success();
-    }
-
-    @ApiNotAuth
-    @RequestMapping("websit/batch/sign")
-    @ApiOperation(value = "网点批量签署回调")
-    public ResponseHelper<String> websitBatchSignResultPost(@RequestParam Map<String, String> params) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.FDD_BATCH_SIGN_NOTIFY + params.get("transaction_id"));
-        if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("冻结法大大批量签署交易号");
-        }
-        try {
-            fddNotifyLogic.websitBatchSignResult(params);
-        } finally {
-            obtain.unlock();
-        }
-        return ResponseHelper.success();
-    }
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/goods/GoodsCategoryController.java

@@ -1,74 +0,0 @@
-package com.gree.mall.manager.controller.goods;
-
-import com.gree.mall.manager.bean.goods.GoodsCategoryBean;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.goods.GoodsCategoryLogic;
-import com.gree.mall.manager.plus.entity.CarouselMap;
-import com.gree.mall.manager.plus.entity.GoodsCategory;
-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.List;
-
-@Slf4j
-@RestController
-@Api(value = "分类管理", tags ={"分类管理"} )
-@RequestMapping(value = "/goods/category", produces = "application/json; charset=utf-8")
-public class GoodsCategoryController {
-
-    @Resource
-    GoodsCategoryLogic goodsCategoryLogic;
-
-    @GetMapping("/list")
-    @ApiOperation(value = "分类管理列表")
-    public ResponseHelper<List<GoodsCategoryBean>> page(
-            @RequestParam(required = false)Integer type,
-            @ApiParam(value = "层级",required = false) @RequestParam(required = false, defaultValue = "1") Integer categoryLevel,
-            @ApiParam(value = "分类名称",required = false) @RequestParam(required = false) String name,
-            @ApiParam(value = "状态(true：显示 false:隐藏",required = false) @RequestParam(required = false) Boolean status,
-            HttpServletRequest request
-    ) throws RemoteServiceException {
-        List<GoodsCategoryBean> list = goodsCategoryLogic.list(type,categoryLevel,name,status,request);
-        return ResponseHelper.success(list);
-    }
-
-    @PostMapping("/add")
-    @ApiOperation(value = "新增分类")
-    public ResponseHelper add(
-            @ApiParam(value = "object",required = true) @RequestBody GoodsCategoryBean goodsCategoryBean,HttpServletRequest request) {
-        goodsCategoryLogic.add(goodsCategoryBean,request);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/update")
-    @ApiOperation(value = "修改分类")
-    public ResponseHelper update(
-            @ApiParam(value = "object",required = true) @RequestBody GoodsCategory goodsCategory) {
-        goodsCategoryLogic.update(goodsCategory);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/delete")
-    @ApiOperation(value = "删除分类")
-    public ResponseHelper delete(
-            @ApiParam(value = "分类id",required = true) @RequestParam String categoryId
-    ) {
-        goodsCategoryLogic.delete(categoryId);
-        return ResponseHelper.success();
-    }
-
-    @GetMapping("/detail")
-    @ApiOperation("详情")
-    public ResponseHelper<GoodsCategory> detail(
-            @ApiParam(value = "分类id",required = true) @RequestParam String categoryId
-    ){
-        GoodsCategory detail = goodsCategoryLogic.detail(categoryId);
-        return ResponseHelper.success(detail);
-    }
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/goods/GoodsController.java

@@ -1,277 +0,0 @@
-package com.gree.mall.manager.controller.goods;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-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 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 org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-@Slf4j
-@RestController
-@Api(value = "商品列表", tags ={"商品列表"} )
-@RequestMapping(value = "/goods", produces = "application/json; charset=utf-8")
-public class GoodsController {
-    @Resource
-    GoodsLogic goodsLogic;
-//    @Autowired
-//    GongdanLogic gongdanLogic;
-
-
-    @GetMapping("/count")
-    @ApiOperation("分类统计")
-    public ResponseHelper<GoodsTypeCount> count(HttpServletRequest request){
-        GoodsTypeCount goodsTypeCount = goodsLogic.countByType(request);
-        return ResponseHelper.success(goodsTypeCount);
-    }
-
-    @GetMapping("/list/page")
-    @ApiOperation(value = "商品列表")
-    public ResponseHelper<IPage<GoodsSpecBean>> page(
-            @ApiParam(value = "商品标志 S=出售中 O=售罄 W=仓库中 A=活动中") @RequestParam(required = false) String flag,
-            @ApiParam(value = "商品关键字") @RequestParam(required = false) String keyword,
-            @ApiParam(value = "销售价格开始区间") @RequestParam(required = false) BigDecimal startPrice,
-            @ApiParam(value = "销售价格结束区间") @RequestParam(required = false) BigDecimal endPrice,
-            @ApiParam(value = "分销金额开始区间") @RequestParam(required = false) BigDecimal startShare,
-            @ApiParam(value = "分销金额开始区间") @RequestParam(required = false) BigDecimal endShare,
-            @ApiParam(value = "排序json格式[{sortColumn: 'PRICE', type: true },...] " +
-                    "sortColumn:商品排序对应值 PRICE=销售价格 SHARE=分销金额 SOLD=销量 STOCK=库存, " +
-                    "type: true=升序 false=倒序")
-            @RequestParam(required = false) String sortJson,
-            @ApiParam(value = "商品分类 传入商品小类") @RequestParam(required = false) String categoryId,
-            @ApiParam(value = "商品状态 true:上架  false:下架") @RequestParam(required = false) Boolean status,
-            @ApiParam(value = "是否支持以旧换新") @RequestParam(required = false) String isTrade,
-            @ApiParam(value = "商品类型：COMMON=普通商品 PACKAGE=套购商品,不传默认为普通商品,支持传多个",required = false)
-            @RequestParam(required = false) List<String> goodsTypes,
-            @ApiParam(value = "页号",required = true) @RequestParam Integer pageNum,
-            @ApiParam(value = "页大小",required = true) @RequestParam Integer pageSize,
-            HttpServletRequest request
-    ) throws Exception {
-        IPage<GoodsSpecBean> goodsSpecBeanIPage = goodsLogic.page(isTrade,flag, keyword, startPrice, endPrice,
-                startShare, endShare, sortJson, categoryId, status,goodsTypes, pageNum, pageSize , request);
-        return ResponseHelper.success(goodsSpecBeanIPage);
-    }
-
-
-    @GetMapping("/package/list")
-    @ApiOperation(value = "套餐商品-列表")
-    public ResponseHelper<IPage<GoodsPackageList>> packageList(
-            @ApiParam(value = "商品关键字") @RequestParam(required = false) String keyword,
-            @ApiParam(value = "销售价格开始区间") @RequestParam(required = false) BigDecimal startPrice,
-            @ApiParam(value = "销售价格结束区间") @RequestParam(required = false) BigDecimal endPrice,
-            @ApiParam(value = "分销金额开始区间") @RequestParam(required = false) BigDecimal startShare,
-            @ApiParam(value = "分销金额开始区间") @RequestParam(required = false) BigDecimal endShare,
-            @ApiParam(value = "排序json格式[{sortColumn: 'PRICE', type: true },...] " +
-                    "sortColumn:商品排序对应值 PRICE=销售价格 SHARE=分销金额 SOLD=销量 STOCK=库存, " +
-                    "type: true=升序 false=倒序")
-            @RequestParam(required = false) String sortJson,
-            @ApiParam(value = "商品分类 传入商品小类") @RequestParam(required = false) String categoryId,
-            @ApiParam(value = "商品状态 true:上架  false:下架") @RequestParam(required = false) Boolean status,
-            @ApiParam(value = "页号",required = true) @RequestParam Integer pageNum,
-            @ApiParam(value = "页大小",required = true) @RequestParam Integer pageSize,
-            HttpServletRequest request
-    ) throws Exception {
-        IPage<GoodsPackageList> goodsPackageListIPage = goodsLogic.packageList(keyword, startPrice, endPrice,
-                startShare, endShare, sortJson, categoryId, status, pageNum, pageSize, request);
-        return ResponseHelper.success(goodsPackageListIPage);
-    }
-
-
-
-    @GetMapping("/listbycategory")
-    @ApiOperation(value = "商品详情")
-    public ResponseHelper<List<GoodsSpecBean>> listbycategory(
-            @ApiParam(value = "商品分类 传入商品小类") @RequestParam(required = false) List<String> categoryIds,
-            HttpServletRequest request
-    ) throws RemoteServiceException {
-        List<GoodsSpecBean> listbycategory = goodsLogic.listbycategory(categoryIds,request);
-        return ResponseHelper.success(listbycategory);
-    }
-
-
-    @GetMapping("/detail")
-    @ApiOperation(value = "商品详情")
-    public ResponseHelper<GoodsSpecBean> detail(
-            @ApiParam(value = "id",required = true) @RequestParam String goodsId
-    ) throws RemoteServiceException {
-        GoodsSpecBean detail = goodsLogic.detail(goodsId);
-        return ResponseHelper.success(detail);
-    }
-
-
-    @GetMapping("/package/poplist")
-    @ApiOperation("套购商品-配置商品列表")
-    public ResponseHelper<List<GoodsPackageBean>> popList(
-            @ApiParam(value = "商品id",required = true) @RequestParam String goodsId,
-            @ApiParam(value = "第几个商品框",required = true) @RequestParam Integer type
-    ) throws RemoteServiceException {
-        List<GoodsPackageBean> goodsPackageBeans = goodsLogic.popList(goodsId, type);
-        return ResponseHelper.success(goodsPackageBeans);
-    }
-
-    @PostMapping("/add")
-    @ApiOperation(value = "新增商品")
-    public ResponseHelper add(
-            @ApiParam(value = "object",required = true) @RequestBody GoodsBean goodsBean,HttpServletRequest request)
-            throws RemoteServiceException {
-        goodsLogic.add(goodsBean,request);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/update")
-    @ApiOperation(value = "修改商品")
-    public ResponseHelper update(
-            @ApiParam(value = "object",required = true) @RequestBody GoodsBean goodsBean,HttpServletRequest request)
-            throws RemoteServiceException {
-        goodsLogic.update(goodsBean,request);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/batchUp")
-    @ApiOperation(value = "批量开启关闭以旧换新")
-    public ResponseHelper batchUp(
-            @ApiParam(value = "商品ids",required = true) @RequestParam List<String> goodsIds,
-            @ApiParam(value = "是否支持 YES NO",required = true) @RequestParam String isTrade)
-            throws RemoteServiceException {
-        goodsLogic.batchUp(goodsIds,isTrade);
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("/status/update")
-    @ApiOperation(value = "商品上下架")
-    public ResponseHelper change(
-            @ApiParam(value = "商品id",required = true) @RequestParam String goodsId,
-            @ApiParam(value = "商品状态:true上架 false下架",required = true) @RequestParam Boolean status
-    ) throws RemoteServiceException {
-        goodsLogic.updateStatus(goodsId, status);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/delete")
-    @ApiOperation(value = "删除商品")
-    public ResponseHelper delete(
-            @ApiParam(value = "商品id",required = true) @RequestParam String goodsId
-    ) throws RemoteServiceException {
-        goodsLogic.delete(goodsId);
-        return ResponseHelper.success();
-    }
-    @PostMapping("/clone")
-    @ApiOperation(value = "克隆商品")
-    public ResponseHelper clone(
-            @ApiParam(value = "商品id",required = true) @RequestParam String goodsId
-    ) throws RemoteServiceException {
-        return ResponseHelper.success(goodsLogic.clone(goodsId));
-    }
-
-
-    @PostMapping("/goods/off/check")
-    @ApiOperation(value = "下架商品前,检测是否秒杀商品")
-    public ResponseHelper SecCheck(
-            @ApiParam(value = "商品id",required = true) @RequestParam String goodsId)
-            throws RemoteServiceException {
-        return ResponseHelper.success(goodsLogic.secCheck(goodsId));
-    }
-
-    @PostMapping("/goods/off/check/batch")
-    @ApiOperation(value = "下架商品前,批量检测是否秒杀商品,返回秒杀的商品id列表")
-    public ResponseHelper SecCheckBatch(
-            @ApiParam(value = "商品id",required = true) @RequestBody List<String> goodsIdList)
-            throws RemoteServiceException {
-        return ResponseHelper.success(goodsLogic.secCheckBatch(goodsIdList));
-    }
-
-
-
-    @PostMapping("/goods/on")
-    @ApiOperation(value = "批量上架商品")
-    public ResponseHelper goodsOn(
-            @ApiParam(value = "object",required = true) @RequestBody List<String> goodsIdList)
-            throws RemoteServiceException {
-        goodsLogic.goodsOnOff(goodsIdList,true);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/goods/off")
-    @ApiOperation(value = "批量下架商品")
-    public ResponseHelper goodsOf(
-            @ApiParam(value = "object",required = true) @RequestBody List<String> goodsIdList)
-            throws RemoteServiceException {
-        goodsLogic.goodsOnOff(goodsIdList,false);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/goods/template")
-    @ApiOperation(value = "批量修改商品模板")
-    public ResponseHelper goodsTemplate(
-            @ApiParam(value = "object",required = true) @RequestBody GoodsTemplateBean goodsTemplateBean,HttpServletRequest request)
-            throws RemoteServiceException {
-        goodsLogic.goodsTemplate(goodsTemplateBean,request);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/goods/batch/freight")
-    @ApiOperation(value = "批量修改运费模板")
-    public ResponseHelper goodsFreight(
-            @ApiParam(value = "object",required = true) @RequestBody GoodsFreightBean goodsFreightBean)
-            throws RemoteServiceException {
-        goodsLogic.goodsFreight(goodsFreightBean);
-        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){
-        goodsLogic.syncGoodsSpecInnerShareMsg(request);
-        return ResponseHelper.success();
-    }
-
-    @GetMapping("/package/user")
-    @ApiOperation(value = "套购商品-指定人员列表")
-    public ResponseHelper<List<User>> packageUserList(
-            @ApiParam(value = "商品id",required = true) @RequestParam(required = true) String goodsId,
-            @ApiParam(value = "商品id",required = false) @RequestParam(required = false) String mobile
-    ) throws Exception {
-        List<User> packageUseUserList = goodsLogic.getPackageUseUserList(goodsId, mobile);
-        return ResponseHelper.success(packageUseUserList);
-    }
-
-
-    @PostMapping("/package/import")
-    @ApiOperation(value = "套购商品-导入指定人员")
-    public ResponseHelper<List<User>> packageUserList(
-            MultipartFile multipartFile
-    ) throws Exception {
-        List<Object> objects = ExcelUtils.importExcel(multipartFile);
-        List<User> users = goodsLogic.importPackageUser(objects);
-        return ResponseHelper.success(users);
-    }
-
-
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/goods/GoodsLeaseController.java

@@ -1,91 +0,0 @@
-package com.gree.mall.manager.controller.goods;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.bean.goods.GoodsLeaseBean;
-import com.gree.mall.manager.bean.goods.GoodsLeaseCountBean;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.goods.GoodsLeaseLogic;
-import com.gree.mall.manager.plus.entity.GoodsLease;
-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.math.BigDecimal;
-import java.util.List;
-
-@Slf4j
-@RestController
-@Api(value = "租赁商品列表", tags ={"租赁商品列表"} )
-@RequestMapping(value = "/goods/lease", produces = "application/json; charset=utf-8")
-public class GoodsLeaseController {
-
-    @Resource
-    GoodsLeaseLogic goodsLeaseLogic;
-
-    @PostMapping("/list/page")
-    @ApiOperation(value = "商品列表")
-    public ResponseHelper<IPage<GoodsLeaseBean>> page(
-            @ApiParam(value = "商品关键字") @RequestParam(required = false) String keyword,
-            @ApiParam(value = "租赁价格开始区间") @RequestParam(required = false) BigDecimal startPrice,
-            @ApiParam(value = "租赁价格结束区间") @RequestParam(required = false) BigDecimal endPrice,
-            @ApiParam(value = "租赁定金开始区间") @RequestParam(required = false) BigDecimal startDeposit,
-            @ApiParam(value = "租赁定金开始区间") @RequestParam(required = false) BigDecimal endDeposit,
-            @ApiParam(value = "排序json格式[{sortColumn: 'PRICE', type: true },...] " +
-                    "sortColumn:商品排序对应值 LEASE_PRICE=租赁价格 DEPOSIT=租赁定金" +
-                    "type: true=升序 false=倒序")
-            @RequestParam(required = false) String sortJson,
-            @ApiParam(value = "商品分类") @RequestParam(required = false) String categoryId,
-            @ApiParam(value = "商品状态 true:上架  false:下架") @RequestParam(required = false) Boolean status,
-            @ApiParam(value = "页号",required = true) @RequestParam Integer pageNum,
-            @ApiParam(value = "页大小",required = true) @RequestParam Integer pageSize,
-            HttpServletRequest request
-    ) throws Exception {
-        IPage<GoodsLeaseBean> goodsSpecBeanIPage = goodsLeaseLogic.page(keyword, startPrice, endPrice,
-                startDeposit, endDeposit, sortJson, categoryId, status, pageNum, pageSize , request);
-        return ResponseHelper.success(goodsSpecBeanIPage);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "详情")
-    public ResponseHelper<GoodsLease> detail(
-            @ApiParam(value = "商品id") @RequestParam String id
-    ) throws Exception {
-        GoodsLease goods = goodsLeaseLogic.detail(id);
-        return ResponseHelper.success(goods);
-    }
-
-    @PostMapping("/save")
-    @ApiOperation(value = "新增/编辑")
-    public ResponseHelper save(
-            @RequestBody GoodsLease goods
-    ) throws Exception {
-
-        goodsLeaseLogic.save(goods);
-
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/del")
-    @ApiOperation(value = "删除")
-    public ResponseHelper del(
-            @ApiParam(value = "商品id") @RequestBody List<String> ids
-    ) throws Exception {
-
-        goodsLeaseLogic.del(ids);
-
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/count")
-    @ApiOperation(value = "数量")
-    public ResponseHelper<GoodsLeaseCountBean> count() throws Exception {
-
-        GoodsLeaseCountBean bean = goodsLeaseLogic.count();
-
-        return ResponseHelper.success(bean);
-    }
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/goods/GoodsLibraryController.java

@@ -1,106 +0,0 @@
-package com.gree.mall.manager.controller.goods;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.goods.GoodsLibraryBean;
-import com.gree.mall.manager.bean.goods.GoodsMaterialVO;
-import com.gree.mall.manager.bean.listvo.goods.GoodsLibraryVO;
-import com.gree.mall.manager.enums.StatusEnum;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.goods.GoodsLibraryLogic;
-import com.gree.mall.manager.plus.entity.GoodsLease;
-import com.gree.mall.manager.zfire.bean.WebsitGoodsParamBean;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-@Slf4j
-@RestController
-@Api(value = "商品库", tags ={"商品库"} )
-@RequiredArgsConstructor
-@RequestMapping(value = "/goods/library", produces = "application/json; charset=utf-8")
-public class GoodsLibraryController {
-
-    private final GoodsLibraryLogic goodsLibraryLogic;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "列表")
-    public ResponseHelper<IPage<GoodsLibraryVO>> page(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) throws Exception {
-        IPage<GoodsLibraryVO> page = goodsLibraryLogic.list(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<GoodsLibraryVO>() {});
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation("导出")
-    public void listExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<GoodsLibraryVO> baseVOIPage = goodsLibraryLogic.list(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "详情")
-    public ResponseHelper<GoodsLibraryBean> detail(
-            @ApiParam(value = "商品id") @RequestParam String goodsLibraryId
-    ) throws Exception {
-        GoodsLibraryBean detail = goodsLibraryLogic.detail(goodsLibraryId);
-        return ResponseHelper.success(detail);
-    }
-
-    @PostMapping("/save")
-    @ApiOperation(value = "新增/编辑")
-    public ResponseHelper save(
-            @RequestBody GoodsLibraryBean goodsLibraryBean
-    ) throws Exception {
-        goodsLibraryLogic.save(goodsLibraryBean);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/del")
-    @ApiOperation(value = "删除")
-    public ResponseHelper del(
-            @ApiParam(value = "商品id") @RequestParam String goodsLibraryId
-    ) throws Exception {
-        goodsLibraryLogic.delete(goodsLibraryId);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/status/batch")
-    @ApiOperation(value = "批量改状态")
-    public ResponseHelper del(
-            @ApiParam(value = "商品id") @RequestParam List<String> goodsLibraryIds,
-            @ApiParam(value = "状态 true/false") @RequestParam Boolean statusEnum
-    ) throws Exception {
-        goodsLibraryLogic.batchStatus(goodsLibraryIds,statusEnum);
-        return ResponseHelper.success();
-    }
-
-
-
-    @PostMapping("/sync")
-    @ApiOperation(value = "同步商品")
-    public ResponseHelper sync() throws Exception {
-        goodsLibraryLogic.sync();
-        return ResponseHelper.success();
-    }
-
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/goods/GoodsMaterialController.java

@@ -1,127 +0,0 @@
-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.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.goods.GoodsMaterialBean;
-import com.gree.mall.manager.bean.goods.GoodsMaterialItemSendVO;
-import com.gree.mall.manager.bean.goods.GoodsMaterialItemVO;
-import com.gree.mall.manager.bean.goods.GoodsMaterialVO;
-import com.gree.mall.manager.enums.material.StateEnum;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.goods.GoodsMaterialLogic;
-import com.gree.mall.manager.zfire.bean.WebsitGoodsParamBean;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-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 javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-@Slf4j
-@RestController
-@Api(value = "商品物料API", tags ={"商品物料API"} )
-@RequestMapping(value = "/goods/material", produces = "application/json; charset=utf-8")
-public class GoodsMaterialController {
-
-    @Resource
-    GoodsMaterialLogic goodsMaterialLogic;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "商品物料-列表")
-    public ResponseHelper<IPage<GoodsMaterialVO>> page(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) throws Exception {
-        IPage<GoodsMaterialVO> page = goodsMaterialLogic.page(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<GoodsMaterialVO>() {});
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation("商品物料-导出")
-    public void listExport(
-            @RequestBody WebsitGoodsParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<GoodsMaterialVO> baseVOIPage = goodsMaterialLogic.page(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "商品物料-详情")
-    public ResponseHelper<GoodsMaterialBean> detail(
-            @ApiParam(value = "id",required = true) @RequestParam String id
-    ) throws RemoteServiceException {
-        GoodsMaterialBean detail = goodsMaterialLogic.detail(id);
-        return ResponseHelper.success(detail);
-    }
-
-    @PostMapping("/add")
-    @ApiOperation(value = "商品物料-新增商品")
-    public ResponseHelper add(
-            @ApiParam(value = "object",required = true) @RequestBody GoodsMaterialBean goodsBean
-    ) throws Exception {
-        goodsMaterialLogic.add(goodsBean);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/update")
-    @ApiOperation(value = "商品物料-修改商品")
-    public ResponseHelper update(
-            @ApiParam(value = "object",required = true) @RequestBody GoodsMaterialBean goodsBean
-    ) throws Exception {
-        goodsMaterialLogic.update(goodsBean);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/batch/update/status")
-    @ApiOperation(value = "商品物料-批量更新状态")
-    public ResponseHelper batchUpdateStatus(
-            @ApiParam(value = "goodsId", required = true) @RequestParam List<String> ids,
-            @ApiParam(value = "ON=有效 OFF=无效", required = true) @RequestParam StateEnum stateEnum
-    ) throws Exception {
-        goodsMaterialLogic.batchUpdateStatus(ids, stateEnum);
-        return ResponseHelper.success();
-    }
-
-
-
-    @PostMapping("/item/count")
-    @ApiOperation(value = "线下销售订单-选择物料明细")
-    public ResponseHelper<IPage<GoodsMaterialItemVO>> itemCount(
-            @ApiParam(value = "规格型号", required = false) @RequestParam(required = false) String specsName,
-            @ApiParam(value = "商品名称", required = false) @RequestParam(required = false) String goodsMaterialName,
-            @RequestParam Integer pageNum,
-            @RequestParam Integer pageSize
-    ) throws Exception {
-        IPage<GoodsMaterialItemVO> goodsMaterialItemVOIPage = goodsMaterialLogic.queryGoodsMaterialItem(specsName,goodsMaterialName, pageNum, pageSize);
-        return ResponseHelper.success(goodsMaterialItemVOIPage);
-    }
-
-
-    @PostMapping("/item/list")
-    @ApiOperation(value = "商品物料明细")
-    public ResponseHelper<Page<GoodsMaterialItemSendVO>> itemList(
-            @ApiParam(value = "规格型号", required = true) @RequestParam(required = true) String specsName,
-            @ApiParam(value = "物料类型 INSIDE=内机 OUT=外机 PARTS=配件", required = false) @RequestParam(required = false) String type,
-            @ApiParam(value = "物料名称", required = false) @RequestParam(required = false) String name,
-            @RequestParam Integer pageNum,
-            @RequestParam Integer pageSize
-    ) throws Exception {
-        Page<GoodsMaterialItemSendVO> goodsMaterialItemVOIPage = goodsMaterialLogic.itemList(specsName, type, name,pageNum,pageSize);
-        return ResponseHelper.success(goodsMaterialItemVOIPage);
-    }
-
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/goods/GoodsMaterialStockAccController.java

@@ -1,62 +0,0 @@
-package com.gree.mall.manager.controller.goods;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.goods.GoodsMaterialVO;
-import com.gree.mall.manager.bean.listvo.goods.GoodsMaterialStockAccVO;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.goods.GoodsMaterialStockAccLogic;
-import com.gree.mall.manager.zfire.bean.WebsitGoodsParamBean;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * @author ：lijh
- * @description：TODO
- * @date ：2024/2/18 10:52
- */
-@RequiredArgsConstructor
-@Slf4j
-@RestController
-@Api(value = "商品物料三级帐API", tags ={"商品物料三级帐API"} )
-@RequestMapping(value = "/goods/material/stock/acc", produces = "application/json; charset=utf-8")
-public class GoodsMaterialStockAccController {
-
-    private final GoodsMaterialStockAccLogic goodsMaterialStockAccLogic;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "列表")
-    public ResponseHelper<IPage<GoodsMaterialStockAccVO>> page(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) throws Exception {
-        IPage<GoodsMaterialStockAccVO> page = goodsMaterialStockAccLogic.list(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<GoodsMaterialStockAccVO>() {});
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation("导出")
-    public void listExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<GoodsMaterialStockAccVO> baseVOIPage = goodsMaterialStockAccLogic.list(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/goods/GoodsNewsCategoryController.java

@@ -1,135 +0,0 @@
-package com.gree.mall.manager.controller.goods;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.CommonTemplateVO;
-import com.gree.mall.manager.bean.goods.*;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.goods.GoodsNewsCategoryLogic;
-import com.gree.mall.manager.plus.entity.GoodsNewsCategory;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-@RestController
-@Api(value = "小程序首页活动", tags = {"首页活动"})
-@RequestMapping(value = "/goods/news/category", produces = "application/json; charset=utf-8")
-public class GoodsNewsCategoryController {
-
-    @Autowired
-    private GoodsNewsCategoryLogic goodsNewsCategoryLogic;
-
-    @ZfireList
-    @PostMapping("/list/pageV2")
-    @ApiOperation(value = "分页获取商品新维度分类列表V2")
-    public ResponseHelper<IPage<GoodsNewsCategoryVO>> pageV2(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<GoodsNewsCategoryVO> page = goodsNewsCategoryLogic.pageV2(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<GoodsNewsCategoryVO>() {});
-    }
-
-    @PostMapping("/pageExport")
-    @ApiOperation(value = "分页获取商品新维度分类列表V2导出")
-    public void listExport(@RequestBody ZfireParamBean zfireParamBean, HttpServletRequest request, HttpServletResponse response) throws Exception {
-        //1.组装查询条件
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
-        //2.查询要导出的内容
-        IPage<GoodsNewsCategoryVO> page = goodsNewsCategoryLogic.pageV2(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(page.getRecords(), zfireParam.getExportFields(), request, response);
-    }
-
-
-
-
-
-    @ApiOperation(value = "分页获取商品新维度分类")
-    @GetMapping("/page")
-    public ResponseHelper<IPage<GoodsNewsCategory>> pageGoodsNewsCategory(
-            HttpServletRequest request,
-            @ApiParam(value = "页号",required = true)@RequestParam Integer pageNum,
-            @ApiParam(value = "页大小(-1不分页)",required = true)@RequestParam Integer pageSize
-    ){
-
-        return ResponseHelper.success(goodsNewsCategoryLogic.pageGoodsNewsCategory(request, pageNum, pageSize));
-    }
-
-
-    @ApiOperation(value = "添加新维度分类")
-    @PostMapping("/addGoodsNewsCategory")
-    public ResponseHelper<GoodsNewsCategory> addGoodsNewsCategory(
-            HttpServletRequest request,
-            @ApiParam(value = "主标题",required = true)@RequestParam String mainTitle,
-            @ApiParam(value = "副标题",required = true)@RequestParam String subTitle,
-            @ApiParam(value = "1=普通商品 2=套购商品",required = true)@RequestParam int type,
-            @ApiParam(value = "排序整数",required = true)@RequestParam Integer sortNum
-    ){
-        return ResponseHelper.success(goodsNewsCategoryLogic.addGoodsNewsCategory(request, mainTitle, subTitle,type,sortNum));
-    }
-
-
-    @ApiOperation(value = "编辑新维度分类")
-    @PostMapping("/vimGoodsNewsCategory")
-    public ResponseHelper vimGoodsNewsCategory(HttpServletRequest request, @RequestBody GoodsNewsCategoryVimBean reqDto){
-        goodsNewsCategoryLogic.vimGoodsNewsCategory(request, reqDto);
-        return ResponseHelper.success();
-    }
-
-    @ApiOperation(value = "关闭或开启新维度分类")
-    @PostMapping("/editStatus")
-    public ResponseHelper editStatus(HttpServletRequest request,  @ApiParam(value = "id",required = true)@RequestParam String goodsNewsCategoryId,
-                                                   @ApiParam(value = "状态 true:开启,false:关闭",required = true)@RequestParam Boolean status){
-        goodsNewsCategoryLogic.editStatus(goodsNewsCategoryId, status,request);
-        return ResponseHelper.success();
-    }
-
-    @ApiOperation(value = "删除新维度分类")
-    @PostMapping("/delete")
-    public ResponseHelper delete( HttpServletRequest request,@ApiParam(value = "id",required = true)@RequestParam String goodsNewsCategoryId){
-        goodsNewsCategoryLogic.delete(goodsNewsCategoryId,request);
-        return ResponseHelper.success();
-    }
-
-    @ApiOperation(value = "新维度分类详情")
-    @GetMapping("/detail")
-    public ResponseHelper<GoodsNewsCategoryDetailBean> detail(@ApiParam(value = "新维度分类id",required = true)@RequestParam String newsCategoryId){
-
-        return ResponseHelper.success(goodsNewsCategoryLogic.detail(newsCategoryId));
-    }
-
-    @ApiOperation(value = "添加活动商品")
-    @PostMapping("/addActiveGoods")
-    public ResponseHelper addActiveGoods(
-            HttpServletRequest request,
-            @RequestBody ActiveGoodsAddReqBean activeGoodsAddReqBean
-    ) {
-        goodsNewsCategoryLogic.addActiveGoods(request, activeGoodsAddReqBean);
-        return ResponseHelper.success();
-    }
-
-
-    @ApiOperation(value = "获取活动商品详情")
-    @GetMapping("/getGoodsActiveDetail")
-    public ResponseHelper<GoodsActiveDetail> getGoodsActiveDetail(
-
-            @RequestParam @ApiParam(value = "唯一id(type>=2可取小程序模板id)",required = true)String objectId,
-            @RequestParam @ApiParam(
-                    value = "类型: 1=新维度分类，2=首页弹窗， 3=活动专区1，4=活动专区2左侧，5=活动专区2右侧，6=专场专区1，7=专场专区2 ， 8=专场专区3 ， 9=专场专区4",
-                    required = true
-            )Integer type
-    ) {
-
-        return ResponseHelper.success(goodsNewsCategoryLogic.getGoodsActiveDetail(objectId, type));
-    }
-
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/goods/GoodsPurchaseController.java

@@ -1,291 +0,0 @@
-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.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.admin.AdminUserCom;
-import com.gree.mall.manager.bean.goods.*;
-import com.gree.mall.manager.constant.Constant;
-import com.gree.mall.manager.enums.ExamineStatusEnum;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.common.CommonLogic;
-import com.gree.mall.manager.logic.goods.GoodsPurchaseLogic;
-import com.gree.mall.manager.zfire.bean.WebsitGoodsParamBean;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.integration.redis.util.RedisLockRegistry;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-
-@Slf4j
-@RestController
-@Api(value = "商品采购入库API", tags ={"商品采购入库API"} )
-@RequestMapping(value = "/goods/purchase", produces = "application/json; charset=utf-8")
-public class GoodsPurchaseController {
-
-    @Resource
-    GoodsPurchaseLogic goodsPurchaseLogic;
-    @Resource
-    RedisLockRegistry redisLockRegistry;
-    @Resource
-    CommonLogic commonLogic;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "商品采购入库-列表")
-    public ResponseHelper<Page<GoodsPurchaseVO>> page(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) throws Exception {
-        IPage<GoodsPurchaseVO> page = goodsPurchaseLogic.page(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<GoodsPurchaseVO>() {});
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation("商品采购入库-导出")
-    public void listExport(
-            @RequestBody WebsitGoodsParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<GoodsPurchaseVO> baseVOIPage = goodsPurchaseLogic.page(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @ZfireList
-    @PostMapping("/item/list")
-    @ApiOperation(value = "商品采购入库-明细列表")
-    public ResponseHelper<IPage<GoodsPurchaseItemVO>> itemPage(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) throws Exception {
-        IPage<GoodsPurchaseItemVO> page = goodsPurchaseLogic.itemPage(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<GoodsPurchaseItemVO>() {});
-    }
-
-    @PostMapping("/item/list/export")
-    @ApiOperation("商品采购入库-明细导出")
-    public void itemListExport(
-            @RequestBody WebsitGoodsParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<GoodsPurchaseItemVO> baseVOIPage = goodsPurchaseLogic.itemPage(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @ZfireList
-    @PostMapping("/code/list")
-    @ApiOperation(value = "商品采购入库-条码列表")
-    public ResponseHelper<IPage<GoodsPurchaseCodeVO>> codePage(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) throws Exception {
-        IPage<GoodsPurchaseCodeVO> page = goodsPurchaseLogic.codePage(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<GoodsPurchaseCodeVO>() {});
-    }
-
-    @PostMapping("/code/list/export")
-    @ApiOperation("商品采购入库-条码导出")
-    public void codeListExport(
-            @RequestBody WebsitGoodsParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<GoodsPurchaseCodeVO> baseVOIPage = goodsPurchaseLogic.codePage(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "商品采购入库-详情")
-    public ResponseHelper<GoodsPurchaseBean> detail(
-            @ApiParam(value = "id",required = true) @RequestParam String id,
-            @ApiParam(value = "是否查当前库存true=是 false=否") @RequestParam(required = false) Boolean isQuery
-    ) throws RemoteServiceException {
-        GoodsPurchaseBean detail = goodsPurchaseLogic.detail(id, isQuery);
-        return ResponseHelper.success(detail);
-    }
-
-    @PostMapping("/add")
-    @ApiOperation(value = "商品采购入库-新增")
-    public ResponseHelper add(
-            @ApiParam(value = "object",required = true) @RequestBody GoodsPurchaseBean bean
-    ) throws RemoteServiceException {
-        goodsPurchaseLogic.add(bean);
-        return ResponseHelper.success(bean);
-    }
-
-    @PostMapping("/update")
-    @ApiOperation(value = "商品采购入库-修改")
-    public ResponseHelper update(
-            @ApiParam(value = "object",required = true) @RequestBody GoodsPurchaseBean goodsBean
-    ) throws Exception {
-        AdminUserCom adminUser = commonLogic.getAdminUser();
-        String lockKey = "";
-        if (Objects.nonNull(adminUser.getAdminCompanyWechat())) {
-            lockKey = adminUser.getAdminCompanyWechat().getCompanyWechatId();
-        }
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.GOODS_MATERIAL_PURCHASE + lockKey);
-        try {
-            if (obtain.tryLock(5, TimeUnit.SECONDS)) {
-                goodsPurchaseLogic.update(goodsBean, adminUser);
-            }
-        } catch(Exception e) {
-            log.error("【商品采购入库修改处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/item/import/code")
-    @ApiOperation(value = "商品采购入库-商品明细导入条码(下载模板:商品采购条码模板.xlsx)")
-    public ResponseHelper itemImportCode(
-            @RequestPart("file") MultipartFile file,
-            @ApiParam(value = "采购商品明细id",required = true) @RequestParam String purchaseItemId
-    ) throws Exception {
-        AdminUserCom adminUser = commonLogic.getAdminUser();
-        String lockKey = "";
-        if (Objects.nonNull(adminUser.getAdminCompanyWechat())) {
-            lockKey = adminUser.getAdminCompanyWechat().getCompanyWechatId();
-        }
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.GOODS_MATERIAL_PURCHASE + lockKey);
-        try {
-            if (obtain.tryLock(5, TimeUnit.SECONDS)) {
-                goodsPurchaseLogic.itemImportCode(file, purchaseItemId, adminUser);
-            }
-        } catch(Exception e) {
-            log.error("【商品采购入库商品明细导入条码处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("/item/add/code")
-    @ApiOperation(value = "商品采购入库-商品明细添加条码")
-    public ResponseHelper itemAddCode(
-            @ApiParam(value = "object",required = true) @RequestBody GoodsPurchaseItemBean itemBean
-    ) throws Exception {
-        AdminUserCom adminUser = commonLogic.getAdminUser();
-        String lockKey = "";
-        if (Objects.nonNull(adminUser.getAdminCompanyWechat())) {
-            lockKey = adminUser.getAdminCompanyWechat().getCompanyWechatId();
-        }
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.GOODS_MATERIAL_PURCHASE + lockKey);
-        try {
-            if (obtain.tryLock(5, TimeUnit.SECONDS)) {
-                goodsPurchaseLogic.itemAddCode(itemBean, adminUser);
-            }
-        } catch(Exception e) {
-            log.error("【商品采购入库商品明细添加条码处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/item/del/code")
-    @ApiOperation(value = "商品采购入库-商品明细删除条码")
-    public ResponseHelper itemDelCode(
-            @ApiParam(value = "采购单id", required = true) @RequestParam String id,
-            @ApiParam(value = "条码记录id", required = true) @RequestParam String codeId
-    ) throws Exception {
-        AdminUserCom adminUser = commonLogic.getAdminUser();
-        String lockKey = "";
-        if (Objects.nonNull(adminUser.getAdminCompanyWechat())) {
-            lockKey = adminUser.getAdminCompanyWechat().getCompanyWechatId();
-        }
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.GOODS_MATERIAL_PURCHASE + lockKey);
-        try {
-            if (obtain.tryLock(5, TimeUnit.SECONDS)) {
-                goodsPurchaseLogic.itemDelCode(id, codeId, adminUser);
-            }
-        } catch(Exception e) {
-            log.error("【商品采购入库商品明细删除条码处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/submit")
-    @ApiOperation(value = "商品采购入库-提交")
-    public ResponseHelper submit(
-            @ApiParam(value = "id",required = true) @RequestParam String id
-    ) throws RemoteServiceException, InterruptedException {
-        AdminUserCom adminUser = commonLogic.getAdminUser();
-        String lockKey = "";
-        if (Objects.nonNull(adminUser.getAdminCompanyWechat())) {
-            lockKey = adminUser.getAdminCompanyWechat().getCompanyWechatId();
-        }
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.GOODS_MATERIAL_PURCHASE + lockKey);
-        try {
-            if (obtain.tryLock(5, TimeUnit.SECONDS)) {
-                goodsPurchaseLogic.submit(id);
-            }
-        } catch(Exception e) {
-            log.error("【商品采购入库提交处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/confirm")
-    @ApiOperation(value = "商品采购入库-审核")
-    public ResponseHelper confirm(
-            @ApiParam(value = "id",required = true) @RequestParam String id,
-            @ApiParam(value = "FAIL=驳回 OK=审核通过", required = true) @RequestParam ExamineStatusEnum statusEnum
-    ) throws RemoteServiceException, InterruptedException {
-        AdminUserCom adminUser = commonLogic.getAdminUser();
-        String lockKey = "";
-        if (Objects.nonNull(adminUser.getAdminCompanyWechat())) {
-            lockKey = adminUser.getAdminCompanyWechat().getCompanyWechatId();
-        }
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.GOODS_MATERIAL_PURCHASE + lockKey);
-        try {
-            if (obtain.tryLock(5, TimeUnit.SECONDS)) {
-                goodsPurchaseLogic.confirm(id, statusEnum);
-            }
-        } catch(Exception e) {
-            log.error("【商品采购入库审核处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/del")
-    @ApiOperation(value = "商品采购入库-删除")
-    public ResponseHelper del(
-            @ApiParam(value = "id", required = true) @RequestParam String id
-    ) throws Exception {
-        goodsPurchaseLogic.del(id);
-        return ResponseHelper.success();
-    }
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/goods/GoodsPurchaseRetController.java

@@ -1,308 +0,0 @@
-package com.gree.mall.manager.controller.goods;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.admin.AdminUserCom;
-import com.gree.mall.manager.bean.goods.*;
-import com.gree.mall.manager.constant.Constant;
-import com.gree.mall.manager.enums.ExamineStatusEnum;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.common.CommonLogic;
-import com.gree.mall.manager.logic.goods.GoodsPurchaseRetLogic;
-import com.gree.mall.manager.zfire.bean.WebsitGoodsParamBean;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.integration.redis.util.RedisLockRegistry;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-
-@Slf4j
-@RestController
-@Api(value = "商品采购退货API", tags ={"商品采购退货API"} )
-@RequestMapping(value = "/goods/purchase/ret", produces = "application/json; charset=utf-8")
-public class GoodsPurchaseRetController {
-
-    @Resource
-    GoodsPurchaseRetLogic goodsPurchaseRetLogic;
-    @Resource
-    RedisLockRegistry redisLockRegistry;
-    @Resource
-    CommonLogic commonLogic;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "商品采购退货-列表")
-    public ResponseHelper<IPage<GoodsPurchaseRetVO>> page(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) throws Exception {
-        IPage<GoodsPurchaseRetVO> page = goodsPurchaseRetLogic.page(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<GoodsPurchaseRetVO>() {});
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation("商品采购退货-导出")
-    public void listExport(
-            @RequestBody WebsitGoodsParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<GoodsPurchaseRetVO> baseVOIPage = goodsPurchaseRetLogic.page(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @ZfireList
-    @PostMapping("/item/list")
-    @ApiOperation(value = "商品采购退货-明细列表")
-    public ResponseHelper<IPage<GoodsPurchaseRetItemVO>> itemPage(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) throws Exception {
-        IPage<GoodsPurchaseRetItemVO> page = goodsPurchaseRetLogic.itemPage(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<GoodsPurchaseRetItemVO>() {});
-    }
-
-    @PostMapping("/item/list/export")
-    @ApiOperation("商品采购退货-明细导出")
-    public void itemListExport(
-            @RequestBody WebsitGoodsParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<GoodsPurchaseRetItemVO> baseVOIPage = goodsPurchaseRetLogic.itemPage(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @ZfireList
-    @PostMapping("/code/list")
-    @ApiOperation(value = "商品采购退货-条码列表")
-    public ResponseHelper<IPage<GoodsPurchaseRetCodeVO>> codePage(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) throws Exception {
-        IPage<GoodsPurchaseRetCodeVO> page = goodsPurchaseRetLogic.codePage(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<GoodsPurchaseRetCodeVO>() {});
-    }
-
-    @PostMapping("/code/list/export")
-    @ApiOperation("商品采购退货-条码导出")
-    public void codeListExport(
-            @RequestBody WebsitGoodsParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<GoodsPurchaseRetCodeVO> baseVOIPage = goodsPurchaseRetLogic.codePage(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "商品采购退货-详情")
-    public ResponseHelper<GoodsPurchaseRetBean> detail(
-            @ApiParam(value = "id",required = true) @RequestParam String id
-    ) throws RemoteServiceException {
-        GoodsPurchaseRetBean detail = goodsPurchaseRetLogic.detail(id);
-        return ResponseHelper.success(detail);
-    }
-
-    @PostMapping("get/purchase/detail")
-    @ApiOperation(value = "商品采购退货-获取入库单详情")
-    public ResponseHelper<GoodsPurchaseBean> getPurchaseDetail(
-            @ApiParam(value = "入库单id",required = true) @RequestParam String purchaseId
-    ) throws RemoteServiceException {
-        GoodsPurchaseBean detail = goodsPurchaseRetLogic.getPurchaseDetail(purchaseId);
-        return ResponseHelper.success(detail);
-    }
-
-    @PostMapping("/add")
-    @ApiOperation(value = "商品采购退货-新增")
-    public ResponseHelper add(
-            @ApiParam(value = "object",required = true) @RequestBody GoodsPurchaseRetBean bean
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.GOODS_MATERIAL_PURCHASE_RET + bean.getGoodsPurchaseId());
-        try {
-            if (obtain.tryLock(5, TimeUnit.SECONDS)) {
-                goodsPurchaseRetLogic.add(bean);
-            }
-        } catch(Exception e) {
-            log.error("【商品采购退货新增处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-        return ResponseHelper.success(bean);
-    }
-
-    @PostMapping("/update")
-    @ApiOperation(value = "商品采购退货-修改")
-    public ResponseHelper update(
-            @ApiParam(value = "object",required = true) @RequestBody GoodsPurchaseRetBean bean
-    ) throws Exception {
-        AdminUserCom adminUser = commonLogic.getAdminUser();
-        String lockKey = "";
-        if (Objects.nonNull(adminUser.getAdminCompanyWechat())) {
-            lockKey = adminUser.getAdminCompanyWechat().getCompanyWechatId();
-        }
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.GOODS_MATERIAL_PURCHASE_RET + bean.getGoodsPurchaseId());
-        try {
-            if (obtain.tryLock(5, TimeUnit.SECONDS)) {
-                goodsPurchaseRetLogic.update(bean, adminUser);
-            }
-        } catch(Exception e) {
-            log.error("【商品采购退货修改处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/item/import/code")
-    @ApiOperation(value = "商品采购退货-商品明细导入条码(下载模板:商品采购条码模板.xlsx)")
-    public ResponseHelper itemImportCode(
-            @RequestPart("file") MultipartFile file,
-            @ApiParam(value = "退货单id",required = true) @RequestParam String id,
-            @ApiParam(value = "采购商品明细id",required = true) @RequestParam String purchaseRetItemId
-    ) throws Exception {
-        AdminUserCom adminUser = commonLogic.getAdminUser();
-        String lockKey = "";
-        if (Objects.nonNull(adminUser.getAdminCompanyWechat())) {
-            lockKey = adminUser.getAdminCompanyWechat().getCompanyWechatId();
-        }
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.GOODS_MATERIAL_PURCHASE_RET + id);
-        try {
-            if (obtain.tryLock(5, TimeUnit.SECONDS)) {
-                goodsPurchaseRetLogic.itemImportCode(file, id, purchaseRetItemId, adminUser);
-            }
-        } catch(Exception e) {
-            log.error("【商品采购退货商品明细导入条码处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/item/add/code")
-    @ApiOperation(value = "商品采购退货-商品明细添加条码")
-    public ResponseHelper itemAddCode(
-            @ApiParam(value = "object",required = true) @RequestBody GoodsPurchaseRetItemBean itemBean
-    ) throws Exception {
-        AdminUserCom adminUser = commonLogic.getAdminUser();
-        String lockKey = "";
-        if (Objects.nonNull(adminUser.getAdminCompanyWechat())) {
-            lockKey = adminUser.getAdminCompanyWechat().getCompanyWechatId();
-        }
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.GOODS_MATERIAL_PURCHASE_RET + itemBean.getGoodsPurchaseRetId());
-        try {
-            if (obtain.tryLock(5, TimeUnit.SECONDS)) {
-                goodsPurchaseRetLogic.itemAddCode(itemBean, adminUser);
-            }
-        } catch(Exception e) {
-            log.error("【商品采购退货商品明细添加条码处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/item/del/code")
-    @ApiOperation(value = "商品采购退货-商品明细删除条码")
-    public ResponseHelper itemDelCode(
-            @ApiParam(value = "退货单id", required = true) @RequestParam String id,
-            @ApiParam(value = "条码记录id", required = true) @RequestParam String codeId
-    ) throws Exception {
-        AdminUserCom adminUser = commonLogic.getAdminUser();
-        String lockKey = "";
-        if (Objects.nonNull(adminUser.getAdminCompanyWechat())) {
-            lockKey = adminUser.getAdminCompanyWechat().getCompanyWechatId();
-        }
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.GOODS_MATERIAL_PURCHASE_RET + id);
-        try {
-            if (obtain.tryLock(5, TimeUnit.SECONDS)) {
-                goodsPurchaseRetLogic.itemDelCode(id, codeId, adminUser);
-            }
-        } catch(Exception e) {
-            log.error("【商品采购退货商品明细删除条码处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/submit")
-    @ApiOperation(value = "商品采购退货-提交")
-    public ResponseHelper submit(
-            @ApiParam(value = "id",required = true) @RequestParam String id
-    ) throws Exception {
-        AdminUserCom adminUser = commonLogic.getAdminUser();
-        String lockKey = "";
-        if (Objects.nonNull(adminUser.getAdminCompanyWechat())) {
-            lockKey = adminUser.getAdminCompanyWechat().getCompanyWechatId();
-        }
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.GOODS_MATERIAL_PURCHASE_RET + id);
-        try {
-            if (obtain.tryLock(5, TimeUnit.SECONDS)) {
-                goodsPurchaseRetLogic.submit(id);
-            }
-        } catch(Exception e) {
-            log.error("【商品采购退货提交处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/confirm")
-    @ApiOperation(value = "商品采购退货-审核")
-    public ResponseHelper confirm(
-            @ApiParam(value = "id",required = true) @RequestParam String id,
-            @ApiParam(value = "FAIL=驳回 OK=审核通过", required = true) @RequestParam ExamineStatusEnum statusEnum
-    ) throws Exception {
-        AdminUserCom adminUser = commonLogic.getAdminUser();
-        String lockKey = "";
-        if (Objects.nonNull(adminUser.getAdminCompanyWechat())) {
-            lockKey = adminUser.getAdminCompanyWechat().getCompanyWechatId();
-        }
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.GOODS_MATERIAL_PURCHASE_RET + id);
-        try {
-            if (obtain.tryLock(5, TimeUnit.SECONDS)) {
-                goodsPurchaseRetLogic.confirm(id, statusEnum);
-            }
-        } catch(Exception e) {
-            log.error("【商品采购退货审核处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/del")
-    @ApiOperation(value = "商品采购退货-删除")
-    public ResponseHelper del(
-            @ApiParam(value = "id", required = true) @RequestParam String id
-    ) throws Exception {
-        goodsPurchaseRetLogic.del(id);
-        return ResponseHelper.success();
-    }
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/goods/GoodsTagController.java

@@ -1,50 +0,0 @@
-package com.gree.mall.manager.controller.goods;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.goods.GoodsTagLogic;
-import com.gree.mall.manager.plus.entity.GoodsTag;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-
-@RestController
-@Api(value = "商品标签", tags = {"商品标签"})
-@RequestMapping(value = "/goods/tag/", produces = "application/json; charset=utf-8")
-public class GoodsTagController {
-
-    @Autowired
-    GoodsTagLogic goodsTagLogic;
-
-
-
-
-    @ApiOperation(value = "分页查询商品标签")
-    @GetMapping("/page")
-    public ResponseHelper<IPage<GoodsTag>> pageGoodsTag(
-            HttpServletRequest request,
-            @ApiParam(value="1 属性标签  2标签",required = true) @RequestParam(required = true) Integer type,
-            @ApiParam(required = true, value = "页号") @RequestParam("pageNum") Integer pageNum,
-            @ApiParam(required = true, value = "页大小(-1即为不分页)") @RequestParam("pageSize") Integer pageSize
-    ) {
-        return ResponseHelper.success(goodsTagLogic.pageGoodsTag(request, pageNum, pageSize,type));
-    }
-
-
-    @ApiOperation(value = "批量编辑标签")
-    @PostMapping("/add")
-    public ResponseHelper updateGoodsTag(
-            HttpServletRequest request,
-            @ApiParam(value="标签(格式: 标签1,标签2 )",required = true) @RequestParam(required = true) String tags,
-            @ApiParam(value="1 属性标签  2标签",required = true) @RequestParam(required = true) Integer type
-    ) {
-        goodsTagLogic.updateGoodsTag(request, tags,type);
-        return ResponseHelper.success();
-    }
-
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/goods/JxGoodsController.java

@@ -1,242 +0,0 @@
-package com.gree.mall.manager.controller.goods;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.goods.GoodsCodeAccVO;
-import com.gree.mall.manager.bean.goods.GoodsSaleLedgerVO;
-import com.gree.mall.manager.bean.goods.GoodsStockVO;
-import com.gree.mall.manager.bean.order.OrderInfoDetailBean;
-import com.gree.mall.manager.bean.order.RefundOrderBody;
-import com.gree.mall.manager.bean.order.SendOrderBody;
-import com.gree.mall.manager.bean.websit.WorkerSettlementLineVO;
-import com.gree.mall.manager.constant.Constant;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.goods.JxGoodsLogic;
-import com.gree.mall.manager.logic.order.OrderLogic;
-import com.gree.mall.manager.logic.order.OrderRefundLogic;
-import com.gree.mall.manager.plus.entity.*;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-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.integration.redis.util.RedisLockRegistry;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-
-@Slf4j
-@RestController
-@Api(value = "进销台账列表", tags ={"进销台账列表"} )
-@RequestMapping(value = "/jx/goods", produces = "application/json; charset=utf-8")
-public class JxGoodsController {
-
-    @Autowired
-    JxGoodsLogic jxGoodsLogic;
-
-    @Autowired
-    OrderLogic orderLogic;
-
-    @Autowired
-    RedisLockRegistry redisLockRegistry;
-
-    @Autowired
-    OrderRefundLogic orderRefundLogic;
-
-    @PostMapping("/importCode")
-    @ApiOperation("初始化条码导入")
-    public ResponseHelper importCode(@RequestParam MultipartFile file
-
-
-    ) throws IOException {
-        jxGoodsLogic.importCode(file);
-        return ResponseHelper.success();
-    }
-
-
-
-    @ZfireList
-    @PostMapping("/list/pageStock")
-    @ApiOperation(value = "商品库存列表")
-    public ResponseHelper<IPage<GoodsStockVO>> pageStock(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<GoodsStockVO> page = jxGoodsLogic.pageStock(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<GoodsStockVO>() {});
-    }
-
-    @PostMapping("/list/pageStockExport")
-    @ApiOperation(value = "商品库存列表导出")
-    public void pageStock(@RequestBody ZfireParamBean zfireParamBean, HttpServletRequest request, HttpServletResponse response) throws Exception {
-        //1.组装查询条件
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
-        //2.查询要导出的内容
-        IPage<GoodsStockVO> page = jxGoodsLogic.pageStock(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(page.getRecords(), zfireParam.getExportFields(), request, response);
-    }
-
-
-    @ZfireList
-    @PostMapping("/list/pageCode")
-    @ApiOperation(value = "商品条码台账")
-    public ResponseHelper<IPage<GoodsCodeAccVO>> pageCode(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<GoodsCodeAccVO> page = jxGoodsLogic.pageCode(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<GoodsCodeAccVO>() {});
-    }
-
-    @PostMapping("/list/pageCodeExport")
-    @ApiOperation(value = "商品条码台账导出")
-    public void pageCode(@RequestBody ZfireParamBean zfireParamBean, HttpServletRequest request, HttpServletResponse response) throws Exception {
-        //1.组装查询条件
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
-        //2.查询要导出的内容
-        IPage<GoodsCodeAccVO> page = jxGoodsLogic.pageCode(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(page.getRecords(), zfireParam.getExportFields(), request, response);
-    }
-
-
-    @ZfireList
-    @PostMapping("/list/pageSale")
-    @ApiOperation(value = "商品销售台账列表")
-    public ResponseHelper<IPage<GoodsSaleLedgerVO>> pageSale(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<GoodsSaleLedgerVO> page = jxGoodsLogic.pageSale(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<GoodsSaleLedgerVO>() {});
-    }
-
-    @PostMapping("/list/pageSaleExport")
-    @ApiOperation(value = "商品销售台账列表导出")
-    public void pageSale(@RequestBody ZfireParamBean zfireParamBean, HttpServletRequest request, HttpServletResponse response) throws Exception {
-        //1.组装查询条件
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
-        //2.查询要导出的内容
-        IPage<GoodsSaleLedgerVO> page = jxGoodsLogic.pageSale(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(page.getRecords(), zfireParam.getExportFields(), request, response);
-    }
-
-
-    @PostMapping("/goods/deliverV2")
-    @ApiOperation("发货")
-    public ResponseHelper deliverV2(
-            @RequestBody SendOrderBody sendOrderBody
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LOCK_ORDER + sendOrderBody.getOrderId());
-        if(!obtain.tryLock(10, TimeUnit.SECONDS)){
-            return ResponseHelper.error("系统繁忙，请稍后再试");
-        }
-        try {
-            orderLogic.deliverV2(sendOrderBody);
-        }finally {
-            obtain.unlock();
-        }
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/save")
-    @ApiOperation("保存发货条码")
-    public ResponseHelper<List<OrderDetailCode>> save(
-            @RequestBody List<OrderDetailCode> orderDetailCodes
-    ){
-        jxGoodsLogic.save(orderDetailCodes);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/remove")
-    @ApiOperation("删除发货条码")
-    public ResponseHelper remove(
-            @RequestParam String  orderDetailCodeId
-    ){
-        jxGoodsLogic.remove(orderDetailCodeId);
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("/detail")
-    @ApiOperation("发货条码详情")
-    public ResponseHelper<List<OrderDetailCode>> detail(
-            @RequestParam String orderId
-    ){
-        List<OrderDetailCode> orderDetailCode = jxGoodsLogic.detail(orderId);
-        return ResponseHelper.success(orderDetailCode);
-    }
-
-
-    @PostMapping("/import")
-    @ApiOperation("导入发货条码")
-    public ResponseHelper importData(@RequestParam MultipartFile file,
-                                     @ApiParam(value = "订单明细id",required = true) @RequestParam String orderDetailId
-
-    ) throws IOException {
-        jxGoodsLogic.importData(file,orderDetailId);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/goods/refundV2")
-    @ApiOperation("退款调用")
-    public ResponseHelper refundV2(
-            @RequestBody RefundOrderBody refundOrderBody
-    ) throws Exception {
-
-        orderRefundLogic.examineRefund(refundOrderBody);
-
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("/importRefund")
-    @ApiOperation("导入退货条码")
-    public ResponseHelper importRefund(@RequestParam MultipartFile file,
-                                       @ApiParam(value = "订单明细id",required = true) @RequestParam String orderDetailId
-    ) throws IOException {
-        jxGoodsLogic.importRefund(file,orderDetailId);
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("/saveRefund")
-    @ApiOperation("保存退货条条码")
-    public ResponseHelper saveRefund(
-            @RequestBody List<OrderRefundCode> orderDetailCodes
-    ){
-        jxGoodsLogic.saveRefund(orderDetailCodes);
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("/detailRefund")
-    @ApiOperation("退货条条码详情")
-    public ResponseHelper<List<OrderRefundCode>> detailRefund(
-            @RequestParam String orderId
-    ){
-        List<OrderRefundCode> orderDetailCode = jxGoodsLogic.detailRefund(orderId);
-        return ResponseHelper.success(orderDetailCode);
-    }
-
-    @PostMapping("/removeRefund")
-    @ApiOperation("删除退货条码")
-    public ResponseHelper removeRefund(
-            @RequestParam String  orderDetailCodeId
-    ){
-        jxGoodsLogic.removeRefund(orderDetailCodeId);
-        return ResponseHelper.success();
-    }
-
-
-
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/letter/LetterController.java

@@ -1,300 +0,0 @@
-package com.gree.mall.manager.controller.letter;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.letter.LeDepartmentVO;
-import com.gree.mall.manager.bean.letter.LeProjectVO;
-import com.gree.mall.manager.bean.letter.LeUserDepartmentVO;
-import com.gree.mall.manager.bean.policy.PolicyDetail;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.LetterLogic;
-import com.gree.mall.manager.plus.entity.LeConfig;
-import com.gree.mall.manager.plus.entity.LeDepartment;
-import com.gree.mall.manager.plus.entity.LeProject;
-import com.gree.mall.manager.plus.entity.LeUserDepartment;
-import com.gree.mall.manager.utils.excel.ExcelUtils;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-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 org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.text.ParseException;
-import java.util.List;
-
-@Slf4j
-@RestController
-@Api(value = "工作联络函基础", tags = {"工作联络函基础"})
-@RequestMapping(value = "/letterManager", produces = "application/json; charset=utf-8")
-public class LetterController {
-
-    @Autowired
-    private LetterLogic letterLogic;
-
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "科室设置列表")
-    public ResponseHelper<IPage<LeDepartmentVO>> list(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) throws RemoteServiceException {
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
-        IPage<LeDepartmentVO> policyOrderVOIPage = letterLogic.list(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam);
-        return ResponseHelper.success(policyOrderVOIPage, new TypeReference<LeDepartmentVO>() {
-        });
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation(value = "科室设置导出")
-    public void listExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //1.组装查询条件
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
-        //2.查询要导出的内容
-        IPage<LeDepartmentVO> policyOrderVOIPage = letterLogic.list(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam);
-        //3.导出
-        FieldUtils.exportData(policyOrderVOIPage.getRecords(), zfireParam.getExportFields(), request, response);
-    }
-
-
-    @PostMapping("/detail")
-    @ApiOperation("科室设置详情")
-    public ResponseHelper<LeDepartment> detail(
-            @ApiParam(value = "id", required = true) @RequestParam String id,
-            HttpServletRequest request
-    ) throws ParseException {
-        LeDepartment leDepartment = letterLogic.detail(id);
-        return ResponseHelper.success(leDepartment);
-    }
-
-    @PostMapping("/add")
-    @ApiOperation("科室设置新增")
-    public ResponseHelper add(
-            @RequestBody LeDepartment leDepartment,
-            HttpServletRequest request
-    ) throws ParseException {
-        letterLogic.add(leDepartment);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/update")
-    @ApiOperation("科室设置修改")
-    public ResponseHelper update(
-            @RequestBody LeDepartment leDepartment,
-            HttpServletRequest request
-    ) throws ParseException {
-        letterLogic.update(leDepartment);
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("/del")
-    @ApiOperation("科室设置删除")
-    public ResponseHelper del(
-            @ApiParam(value = "id", required = true) @RequestParam String id,
-            HttpServletRequest request
-    ) throws ParseException {
-        letterLogic.del(id);
-        return ResponseHelper.success();
-    }
-
-
-    @ZfireList
-    @PostMapping("/listUser")
-    @ApiOperation(value = "所属科室列表")
-    public ResponseHelper<IPage<LeUserDepartmentVO>> listUser(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) throws RemoteServiceException {
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
-        IPage<LeUserDepartmentVO> policyOrderVOIPage = letterLogic.listUser(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam);
-        return ResponseHelper.success(policyOrderVOIPage, new TypeReference<LeUserDepartmentVO>() {
-        });
-    }
-
-    @PostMapping("/listUser/export")
-    @ApiOperation(value = "所属科室列表导出")
-    public void listUserExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //1.组装查询条件
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
-        //2.查询要导出的内容
-        IPage<LeUserDepartmentVO> policyOrderVOIPage = letterLogic.listUser(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam);
-        //3.导出
-        FieldUtils.exportData(policyOrderVOIPage.getRecords(), zfireParam.getExportFields(), request, response);
-    }
-
-
-
-    @PostMapping("/detailUser")
-    @ApiOperation("所属科室列表详情")
-    public ResponseHelper<LeUserDepartment> detailUser(
-            @ApiParam(value = "id", required = true) @RequestParam String id,
-            HttpServletRequest request
-    ) throws ParseException {
-        LeUserDepartment leDepartment = letterLogic.detailUser(id);
-        return ResponseHelper.success(leDepartment);
-    }
-
-    @PostMapping("/addUser")
-    @ApiOperation("所属科室列表新增")
-    public ResponseHelper addUser(
-            @RequestBody LeUserDepartment leUserDepartment,
-            HttpServletRequest request
-    ) throws ParseException {
-        letterLogic.addUser(leUserDepartment);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/updateUser")
-    @ApiOperation("所属科室列表修改")
-    public ResponseHelper updateUser(
-            @RequestBody LeUserDepartment leUserDepartment,
-            HttpServletRequest request
-    ) throws ParseException {
-        letterLogic.updateUser(leUserDepartment);
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("/delUser")
-    @ApiOperation("所属科室列表置删除")
-    public ResponseHelper delUser(
-            @ApiParam(value = "id", required = true) @RequestParam String id,
-            HttpServletRequest request
-    ) throws ParseException {
-        letterLogic.delUser(id);
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("/import")
-    @ApiOperation(value = "所属科室导入")
-    public ResponseHelper importUser(
-            @RequestParam MultipartFile file
-    ) throws RemoteServiceException, IOException {
-        List<Object> objects = ExcelUtils.importExcel(file);
-        letterLogic.importUser(objects);
-        return ResponseHelper.success();
-    }
-
-
-
-    @PostMapping("/configDeatil")
-    @ApiOperation("考核函时间设置")
-    public ResponseHelper<LeConfig> configDeatil(
-            HttpServletRequest request
-    ) throws ParseException {
-        LeConfig leConfig = letterLogic.configDeatil();
-        return ResponseHelper.success(leConfig);
-    }
-
-    @PostMapping("/addConfig")
-    @ApiOperation("考核涵配置修改")
-    public ResponseHelper addConfig(
-            @RequestBody LeConfig leConfig,
-            HttpServletRequest request
-    ) throws ParseException {
-        letterLogic.addConfig(leConfig);
-        return ResponseHelper.success();
-    }
-
-
-
-    @ZfireList
-    @PostMapping("/listProject")
-    @ApiOperation(value = "考核项目设置")
-    public ResponseHelper<IPage<LeProjectVO>> listProject(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) throws RemoteServiceException {
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
-        IPage<LeProjectVO> policyOrderVOIPage = letterLogic.listProject(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam);
-        return ResponseHelper.success(policyOrderVOIPage, new TypeReference<LeProjectVO>() {
-        });
-    }
-
-    @PostMapping("/listProject/export")
-    @ApiOperation(value = "考核项目设置导出")
-    public void listProjectExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //1.组装查询条件
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
-        //2.查询要导出的内容
-        IPage<LeProjectVO> policyOrderVOIPage = letterLogic.listProject(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam);
-        //3.导出
-        FieldUtils.exportData(policyOrderVOIPage.getRecords(), zfireParam.getExportFields(), request, response);
-    }
-
-
-    @PostMapping("/detailProject")
-    @ApiOperation("考核项目详情")
-    public ResponseHelper<LeProject> detailProject(
-            @ApiParam(value = "id", required = true) @RequestParam String id,
-            HttpServletRequest request
-    ) throws ParseException {
-        LeProject leProject = letterLogic.detailProject(id);
-        return ResponseHelper.success(leProject);
-    }
-
-    @PostMapping("/addProject")
-    @ApiOperation("考核项目新增")
-    public ResponseHelper addProject(
-            @RequestBody LeProject leProject,
-            HttpServletRequest request
-    ) throws ParseException {
-        letterLogic.addProject(leProject);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/updateProject")
-    @ApiOperation("考核项目修改")
-    public ResponseHelper updateProject(
-            @RequestBody LeProject leProject,
-            HttpServletRequest request
-    ) throws ParseException {
-        letterLogic.updateProject(leProject);
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("/delProject")
-    @ApiOperation("考核项目删除")
-    public ResponseHelper delProject(
-            @ApiParam(value = "id", required = true) @RequestParam String id,
-            HttpServletRequest request
-    ) throws ParseException {
-        letterLogic.delProject(id);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/importProject")
-    @ApiOperation(value = "考核项目导入")
-    public ResponseHelper importProject(
-            @RequestParam MultipartFile file
-    ) throws RemoteServiceException, IOException {
-        List<Object> objects = ExcelUtils.importExcel(file);
-        letterLogic.importProject(objects);
-        return ResponseHelper.success();
-    }
-
-
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/letter/LetterProcessController.java

@@ -1,165 +0,0 @@
-package com.gree.mall.manager.controller.letter;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.letter.*;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.LetterLogic;
-import com.gree.mall.manager.plus.entity.*;
-import com.gree.mall.manager.utils.excel.ExcelUtils;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-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 org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.text.ParseException;
-import java.util.List;
-
-@Slf4j
-@RestController
-@Api(value = "工作联络函", tags = {"工作联络函"})
-@RequestMapping(value = "/letterProcess", produces = "application/json; charset=utf-8")
-public class LetterProcessController {
-
-    @Autowired
-    private LetterLogic letterLogic;
-
-
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "工作联络函列表")
-    public ResponseHelper<IPage<LeLetterVO>> listLetter(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) throws RemoteServiceException {
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
-        IPage<LeLetterVO> policyOrderVOIPage = letterLogic.listLetter(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam);
-        return ResponseHelper.success(policyOrderVOIPage, new TypeReference<LeLetterVO>() {
-        });
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation(value = "工作联络函导出")
-    public void listExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //1.组装查询条件
-        ZfireParamBean zfireParam = FieldUtils.supplyParam(zfireParamBean);
-        //2.查询要导出的内容
-        IPage<LeLetterVO> policyOrderVOIPage = letterLogic.listLetter(new Page(zfireParam.getPageNum(), zfireParam.getPageSize()), zfireParam);
-        //3.导出
-        FieldUtils.exportData(policyOrderVOIPage.getRecords(), zfireParam.getExportFields(), request, response);
-    }
-
-
-    @PostMapping("/detailLetter")
-    @ApiOperation("工作联络函详情")
-    public ResponseHelper<LeLetterDetail> detailLetter(
-            @ApiParam(value = "id", required = true) @RequestParam String id,
-            HttpServletRequest request
-    ) throws ParseException {
-        LeLetterDetail leLetter = letterLogic.detailLetter(id);
-        return ResponseHelper.success(leLetter);
-    }
-
-    @PostMapping("/addLetter")
-    @ApiOperation("新增工作联络函")
-    public ResponseHelper addLetter(
-            @RequestBody LeLetter leLetter,
-            HttpServletRequest request
-    ) throws ParseException {
-        letterLogic.addLetter(leLetter);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/updateLetter")
-    @ApiOperation("工作联络函修改")
-    public ResponseHelper updateLetter(
-            @RequestBody LeLetter leLetter,
-            HttpServletRequest request
-    ) throws ParseException {
-        letterLogic.updateLetter(leLetter);
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("/delLetter")
-    @ApiOperation("工作联络函删除")
-    public ResponseHelper delLetter(
-            @ApiParam(value = "id", required = true) @RequestParam String id,
-            HttpServletRequest request
-    ) throws ParseException {
-        letterLogic.delLetter(id);
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("/send")
-    @ApiOperation("发送")
-    public ResponseHelper send(
-            @ApiParam(value = "id", required = true) @RequestParam List<String> ids,
-            HttpServletRequest request
-    ) throws ParseException {
-        letterLogic.send(ids);
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("/cancel")
-    @ApiOperation("作废")
-    public ResponseHelper cancel(
-            @ApiParam(value = "id", required = true) @RequestParam List<String> ids,
-            HttpServletRequest request
-    ) throws ParseException {
-        letterLogic.cancel(ids);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/reject")
-    @ApiOperation("驳回")
-    public ResponseHelper reject(
-            @ApiParam(value = "id", required = true) @RequestParam List<String> ids,
-            HttpServletRequest request
-    ) throws ParseException {
-        letterLogic.reject(ids);
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("/appeal")
-    @ApiOperation("网点申诉")
-    public ResponseHelper appeal(
-            @RequestBody LeLetterItem leLetterItem,
-            HttpServletRequest request
-    ) throws ParseException {
-        letterLogic.appeal(leLetterItem);
-        return ResponseHelper.success();
-    }
-
-
-
-    @PostMapping("/examine")
-    @ApiOperation("中心批复")
-    public ResponseHelper examine(
-            @RequestBody LeLetterItem leLetterItem,
-            HttpServletRequest request
-    ) throws ParseException {
-        letterLogic.examine(leLetterItem);
-        return ResponseHelper.success();
-    }
-
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/manual/ManualWorkController.java

@@ -1,36 +0,0 @@
-//package com.gree.mall.manager.controller.manual;
-//
-//
-//import com.gree.mall.manager.exception.RemoteServiceException;
-//import com.gree.mall.manager.helper.ResponseHelper;
-//import com.gree.mall.manager.logic.manual.ManualWorkLogic;
-//import com.gree.mall.manager.plus.entity.User;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import io.swagger.annotations.ApiParam;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.beans.BeanUtils;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.*;
-//
-//import javax.servlet.http.HttpServletRequest;
-//import java.util.List;
-//
-//@Slf4j
-//@RestController
-//@Api(value = "人工指定业务员", tags = {"人工指定业务员"})
-//@RequestMapping(value = "/manual", produces = "application/json; charset=utf-8")
-//public class ManualWorkController {
-//    @Autowired
-//    private ManualWorkLogic manualWorkLogic;
-//    @PostMapping("/assign/worker")
-//    @ApiOperation(value = "指定业务员")
-//    public ResponseHelper assignWorker(
-//            HttpServletRequest request,
-//            @ApiParam(value = "个人微信的手机号", required = true) @RequestParam String personalPhone,
-//            @ApiParam(value = "企业微信的手机号", required = true) @RequestParam String workPhone
-//    ) throws RemoteServiceException {
-//        return ResponseHelper.success(manualWorkLogic.assignWorker(request, personalPhone, workPhone));
-//    }
-//
-//}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/marketing/DynamicMaterialsController.java

@@ -1,70 +0,0 @@
-//package com.gree.mall.manager.controller.marketing;
-//
-//import com.baomidou.mybatisplus.core.metadata.IPage;
-//import com.gree.mall.manager.bean.marketing.DynamicMaterialsDetailsBean;
-//import com.gree.mall.manager.bean.marketing.DynamicMaterialsPageBean;
-//import com.gree.mall.manager.helper.ResponseHelper;
-//import com.gree.mall.manager.logic.marketing.DynamicMaterialsLogic;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import io.swagger.annotations.ApiParam;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.GetMapping;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import org.springframework.web.bind.annotation.RestController;
-//
-//import javax.servlet.http.HttpServletRequest;
-//
-//@Api(value = "动态素材", tags = {"动态素材"})
-//@RestController
-//@RequestMapping(value = "/dynamic/materials", produces = "application/json; charset=utf-8")
-//public class DynamicMaterialsController {
-//
-//
-//    @Autowired
-//    private DynamicMaterialsLogic dynamicMaterialsLogic;
-//
-//    @ApiOperation("分页查询动态素材")
-//    @GetMapping("/page")
-//    public ResponseHelper<IPage<DynamicMaterialsPageBean>> page(
-//            HttpServletRequest request,
-//            @ApiParam(value = "名称", required = false) @RequestParam(required = false) String name,
-//            @ApiParam(value = "页号", required = true) @RequestParam(required = true) Integer pageNum,
-//            @ApiParam(value = "页大小", required = true) @RequestParam(required = true) Integer pageSize
-//    ) {
-//
-//        IPage<DynamicMaterialsPageBean> page = dynamicMaterialsLogic.page(request, name, pageNum, pageSize);
-//
-//        return ResponseHelper.success(page);
-//    }
-//
-//    @ApiOperation("动态素材详情")
-//    @GetMapping("/details")
-//    public ResponseHelper<DynamicMaterialsDetailsBean> details(
-//            HttpServletRequest request,
-//            @ApiParam(value = "素材id", required = true) @RequestParam(required = true) String materialsId,
-//            @ApiParam(value = "客户名称", required = false) @RequestParam(required = false) String name,
-//            @ApiParam(value = "开始时间", required = false) @RequestParam(required = false) String beginTime,
-//            @ApiParam(value = "结束时间", required = false) @RequestParam(required = false) String endTime
-//    ) {
-//
-//        DynamicMaterialsDetailsBean details = dynamicMaterialsLogic.details(request, materialsId, name, beginTime, endTime);
-//
-//        return ResponseHelper.success(details);
-//    }
-//
-//
-//    @ApiOperation("批量发消息到企业微信用户")
-//    @GetMapping("/sendToEnterpriseWechatWorker")
-//    public ResponseHelper<Void> sendToEnterpriseWechatWorker(
-//            HttpServletRequest request,
-//            @ApiParam(value = "企业微信userid(（多个接收者wechatUserId用‘|’分隔，最多支持1000个 指定为'@all'，则向该企业应用的全部成员发送）)", required = true)
-//            @RequestParam(required = true)String wechatUserId,
-//            @ApiParam(value = "消息内容 示例:11\n22<a href=\"http://work.weixin.qq.com\">33</a>，44。", required = true)
-//            @RequestParam(required = true)String content
-//    )  {
-//        dynamicMaterialsLogic.sendToEnterpriseWechatWorker(request, wechatUserId, content);
-//        return ResponseHelper.success();
-//    }
-//}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/marketing/MarketingMaterialsController.java

@@ -1,129 +0,0 @@
-//package com.gree.mall.manager.controller.marketing;
-//
-//
-//import com.baomidou.mybatisplus.core.metadata.IPage;
-//import com.gree.mall.manager.bean.admin.AdminUserCom;
-//import com.gree.mall.manager.bean.marketing.MarketingMaterialsAddReqBean;
-//import com.gree.mall.manager.bean.marketing.MarketingMaterialsUpdateReqBean;
-//import com.gree.mall.manager.helper.ResponseHelper;
-//import com.gree.mall.manager.logic.marketing.MarketingMaterialsLogic;
-//import com.gree.mall.manager.plus.entity.MarketingMaterials;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import io.swagger.annotations.ApiParam;
-//import me.chanjar.weixin.common.error.WxErrorException;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.*;
-//
-//import javax.servlet.http.HttpServletRequest;
-//import java.io.IOException;
-//
-//@Api(value = "营销素材", tags = {"营销素材"})
-//@RestController
-//@RequestMapping(value = "/marketing/materials", produces = "application/json; charset=utf-8")
-//public class MarketingMaterialsController {
-//
-//    @Autowired
-//    private MarketingMaterialsLogic marketingMaterialsLogic;
-//
-//
-//    @ApiOperation("分页获取营销素材")
-//    @GetMapping("/page")
-//    public ResponseHelper<IPage<MarketingMaterials>> page(
-//            HttpServletRequest request,
-//            @ApiParam(value = "标题", required = false) @RequestParam(required = false) String title,
-//            @ApiParam(value = "分组id", required = false) @RequestParam(required = false) String groupId,
-//            @ApiParam(value = "素材类型: 1:文本  2.图片  3.视屏 4.网页 5.小程序 6.文件", required = true) @RequestParam(required = true) String type,
-//            @ApiParam(value = "页号", required = true) @RequestParam(required = true) Integer pageNum,
-//            @ApiParam(value = "页大小", required = true) @RequestParam(required = true) Integer pageSize
-//    ) throws IOException {
-//
-//        IPage<MarketingMaterials> page = marketingMaterialsLogic.page(request, title, groupId, type, pageNum, pageSize);
-//
-//        return ResponseHelper.success(page);
-//    }
-//
-//
-//    @ApiOperation("移组")
-//    @PostMapping("/moveGroup")
-//    public ResponseHelper<Void> moveGroup(
-//            HttpServletRequest request,
-//            @ApiParam(value = "营销素材id 格式:id1,id2", required = true) @RequestParam(required = true) String marketingMaterialsId,
-//            @ApiParam(value = "新营销组id", required = true) @RequestParam(required = true) String newGroupId
-//    ) {
-//
-//        marketingMaterialsLogic.moveGroup(request, marketingMaterialsId, newGroupId);
-//
-//        return ResponseHelper.success();
-//    }
-//
-//
-//    @ApiOperation("重置")
-//    @PostMapping("/reset")
-//    public ResponseHelper<Void> reset(
-//            @ApiParam(value = "营销组id", required = true) @RequestParam(required = true) String groupId,
-//            @ApiParam(value = "素材类型: 1:文本  2.图片  3.视屏 4.网页 5.小程序 6.文件", required = true)
-//            @RequestParam(required = true) String type
-//    ) {
-//
-//        marketingMaterialsLogic.reset(groupId, type);
-//
-//        return ResponseHelper.success();
-//    }
-//
-//    @ApiOperation("新增素材")
-//    @PostMapping("/add")
-//    public ResponseHelper<String> add(
-//            HttpServletRequest request, @RequestBody MarketingMaterialsAddReqBean marketingMaterialsAddReqBean
-//    ) throws IOException {
-//
-//        String  id = marketingMaterialsLogic.add(request, marketingMaterialsAddReqBean);
-//
-//        return ResponseHelper.success(id);
-//    }
-//
-//    @ApiOperation("移除素材")
-//    @PostMapping("/deleteById")
-//    public ResponseHelper<Void> deleteById(
-//            @ApiParam(value = "营销素材id", required = true) @RequestParam(required = true) String marketingMaterialsId
-//    ) {
-//        marketingMaterialsLogic.deleteById(marketingMaterialsId);
-//        return ResponseHelper.success();
-//    }
-//
-//    @ApiOperation("編輯素材")
-//    @PostMapping("/update")
-//    public ResponseHelper<Void> update(
-//            HttpServletRequest request, @RequestBody MarketingMaterialsUpdateReqBean updateReqBean
-//    ) throws IOException {
-//
-//        marketingMaterialsLogic.update(request, updateReqBean);
-//
-//        return ResponseHelper.success();
-//    }
-//
-//    @ApiOperation("通过id查询編輯详情")
-//    @GetMapping("/getUpdateDetailById")
-//    public ResponseHelper<MarketingMaterialsUpdateReqBean> getUpdateDetailById(
-//            @ApiParam(value = "营销素材id", required = true) @RequestParam(required = true) String marketingMaterialsId
-//    ) throws IOException {
-//        MarketingMaterialsUpdateReqBean byId = marketingMaterialsLogic.getById(marketingMaterialsId);
-//
-//        return ResponseHelper.success(byId);
-//    }
-//
-//    @ApiOperation("上传素材至企业微信")
-//    @PostMapping("/loadToQyWx")
-//    public ResponseHelper<String> loadToQyWx(
-//            HttpServletRequest request,
-//            @ApiParam(value = "文件url", required = true) @RequestParam(required = true) String fileUrl,
-//            @ApiParam(value = "文件类型 图片（image）：10MB，支持JPG,PNG格式\n" +
-//                    "语音（voice） ：2MB，播放长度不超过60s，仅支持AMR格式\n" +
-//                    "视频（video） ：10MB，支持MP4格式\n" +
-//                    "普通文件（file）：20MB", required = true) @RequestParam(required = true) String fileType
-//    ) throws IOException, WxErrorException {
-//        String s = marketingMaterialsLogic.loadToQyWx(request, fileUrl, fileType);
-//        return ResponseHelper.success(s);
-//    }
-//
-//}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/marketing/MarketingMaterialsGroupController.java

@@ -1,62 +0,0 @@
-package com.gree.mall.manager.controller.marketing;
-
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.marketing.MarketingMaterialsGroupLogic;
-import com.gree.mall.manager.plus.entity.MarketingMaterialsGroup;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-
-@Api(value = "营销素材组", tags = {"营销素材组"})
-@RestController
-@RequestMapping(value = "/marketing/group", produces = "application/json; charset=utf-8")
-public class MarketingMaterialsGroupController {
-
-    @Autowired
-    private MarketingMaterialsGroupLogic marketingMaterialsGroupLogic;
-
-
-    @ApiOperation("获取所有分组")
-    @GetMapping("/list")
-    public ResponseHelper<List<MarketingMaterialsGroup>> list(
-            HttpServletRequest request,
-            @ApiParam(value = "分组名称", required = false) @RequestParam(required = false) String groupName
-    ) {
-        return ResponseHelper.success(marketingMaterialsGroupLogic.list(request, groupName));
-    }
-
-
-    @ApiOperation("添加分组")
-    @PostMapping("/add")
-    public ResponseHelper<MarketingMaterialsGroup> add(
-            HttpServletRequest request,
-            @ApiParam(value = "分组名称", required = true) @RequestParam(required = true) String groupName
-    ) {
-        MarketingMaterialsGroup add = marketingMaterialsGroupLogic.add(request, groupName);
-        return ResponseHelper.success(add);
-    }
-
-    @ApiOperation("修改分组名称")
-    @PostMapping("/update")
-    public ResponseHelper<Void> update(@ApiParam(value = "分组id", required = true) @RequestParam(required = true) String groupId,
-                                       @ApiParam(value = "分组名称", required = true) @RequestParam(required = true) String groupName) {
-        marketingMaterialsGroupLogic.update(groupId, groupName);
-        return ResponseHelper.success();
-    }
-
-
-    @ApiOperation("删除分组")
-    @PostMapping("/delete")
-    public ResponseHelper<Void> delete(@ApiParam(value = "分组id", required = true) @RequestParam(required = true) String groupId) {
-
-        marketingMaterialsGroupLogic.delete(groupId);
-        return ResponseHelper.success();
-    }
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/material/base/MaterialCategoryController.java

@@ -1,80 +0,0 @@
-package com.gree.mall.manager.controller.material.base;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.material.base.MaterialCategoryTree;
-import com.gree.mall.manager.bean.material.base.MaterialCategoryVO;
-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.material.base.MaterialCategoryLogic;
-import com.gree.mall.manager.plus.entity.WebsitGoodsCategory;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.integration.redis.util.RedisLockRegistry;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-
-@Slf4j
-@RestController
-@Api(value = "辅材分类API", tags ={"辅材分类API"} )
-@RequestMapping(value = "/material/category", produces = "application/json; charset=utf-8")
-public class MaterialCategoryController {
-
-    @Resource
-    MaterialCategoryLogic materialCategoryLogic;
-    @Resource
-    RedisLockRegistry redisLockRegistry;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "商品分类-列表")
-    public ResponseHelper<IPage<MaterialCategoryVO>> page(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<MaterialCategoryVO> page = materialCategoryLogic.page(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<MaterialCategoryVO>() {});
-    }
-
-    @PostMapping("/tree")
-    @ApiOperation(value = "商品分类-树形")
-    public ResponseHelper<List<MaterialCategoryTree>> tree(
-            @ApiParam(value = "状态 ON=有效 OFF=无效") @RequestParam(required = false) String state
-    ) {
-        List<MaterialCategoryTree> trees = materialCategoryLogic.materialCategoryTree(state);
-        return ResponseHelper.success(trees);
-    }
-
-    @PostMapping("/add")
-    @ApiOperation(value = "商品分类-新增")
-    public ResponseHelper add(@RequestBody WebsitGoodsCategory category) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.PARTS_BASE_MANAGE);
-        try {
-            if (obtain.tryLock(5, TimeUnit.SECONDS)) {
-                materialCategoryLogic.add(category);
-                return ResponseHelper.success();
-            }
-        } catch (Exception e) {
-            log.error("新增商品分类失败！", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-        return ResponseHelper.error("新增失败");
-    }
-
-    @PostMapping("/update")
-    @ApiOperation(value = "商品分类-修改")
-    public ResponseHelper update(@RequestBody WebsitGoodsCategory category) throws RemoteServiceException {
-        materialCategoryLogic.update(category);
-        return ResponseHelper.success();
-    }
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/material/base/NormChargeController.java

@@ -1,110 +0,0 @@
-package com.gree.mall.manager.controller.material.base;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.material.base.WebsitNormChargeBean;
-import com.gree.mall.manager.bean.material.base.WebsitNormChargeVO;
-import com.gree.mall.manager.enums.material.StateEnum;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.material.base.NormChargeLogic;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-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 org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-@Slf4j
-@RestController
-@Api(value = "辅材收费标准API", tags ={"辅材收费标准API"} )
-@RequestMapping(value = "/material/norm", produces = "application/json; charset=utf-8")
-public class NormChargeController {
-
-    @Resource
-    NormChargeLogic normChargeLogic;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "辅材收费标准-列表")
-    public ResponseHelper<IPage<WebsitNormChargeVO>> page(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<WebsitNormChargeVO> page = normChargeLogic.page(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<WebsitNormChargeVO>() {});
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation("辅材收费标准-导出")
-    public void listExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WebsitNormChargeVO> baseVOIPage = normChargeLogic.page(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "辅材收费标准-详情")
-    public ResponseHelper<WebsitNormChargeBean> detail(
-            @ApiParam(value = "id", required = true) @RequestParam String id
-    ) throws RemoteServiceException {
-        return ResponseHelper.success(normChargeLogic.detail(id));
-    }
-
-    @PostMapping("/add")
-    @ApiOperation(value = "辅材收费标准-添加")
-    public ResponseHelper add(
-            @RequestBody WebsitNormChargeBean bean
-    ) throws Exception {
-        normChargeLogic.add(bean);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/edit")
-    @ApiOperation(value = "辅材收费标准-编辑")
-    public ResponseHelper edit(
-            @RequestBody WebsitNormChargeBean bean
-    ) throws Exception {
-        normChargeLogic.edit(bean);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/batch/update/status")
-    @ApiOperation(value = "辅材收费标准-批量更新状态")
-    public ResponseHelper batchUpdateStatus(
-            @ApiParam(value = "id", required = true) @RequestParam List<String> ids,
-            @ApiParam(value = "ON=有效 OFF=无效", required = true) @RequestParam StateEnum stateEnum
-    ) throws Exception {
-        normChargeLogic.batchUpdateStatus(ids, stateEnum);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/import")
-    @ApiOperation(value = "辅材收费标准-导入(下载模板:辅材收费标准模板（物料收费）.xlsx)")
-    public ResponseHelper<String> importData (
-            @RequestPart("file") MultipartFile file
-    ) throws Exception {
-        return ResponseHelper.success(normChargeLogic.importData(file));
-    }
-
-    @PostMapping("/import2")
-    @ApiOperation(value = "辅材收费标准-导入(下载模板:辅材收费标准模板（服务收费）.xlsx)")
-    public ResponseHelper<String> importData2 (
-            @RequestPart("file") MultipartFile file
-    ) throws Exception {
-        return ResponseHelper.success(normChargeLogic.importData2(file));
-    }
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/material/base/PartsBaseController.java

@@ -1,164 +0,0 @@
-package com.gree.mall.manager.controller.material.base;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.material.base.PartsBaseVO;
-import com.gree.mall.manager.constant.Constant;
-import com.gree.mall.manager.enums.material.PartBaseTypeEnum;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.material.base.PartsBaseLogic;
-import com.gree.mall.manager.plus.entity.MaterialConfig;
-import com.gree.mall.manager.plus.entity.WebsitPartsBase;
-import com.gree.mall.manager.utils.CommonUtils;
-import com.gree.mall.manager.utils.excel.ExcelUtils;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.integration.redis.util.RedisLockRegistry;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-
-@Slf4j
-@RestController
-@Api(value = "配件基础API", tags ={"配件基础API"} )
-@RequestMapping(value = "/parts/base", produces = "application/json; charset=utf-8")
-public class PartsBaseController {
-
-    @Resource
-    PartsBaseLogic partsBaseLogic;
-    @Resource
-    RedisLockRegistry redisLockRegistry;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "配件基础-列表")
-    public ResponseHelper<IPage<PartsBaseVO>> page(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<PartsBaseVO> page = partsBaseLogic.page(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<PartsBaseVO>() {});
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation("配件基础-导出")
-    public void listExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<PartsBaseVO> baseVOIPage = partsBaseLogic.page(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "配件基础-详情")
-    public ResponseHelper<WebsitPartsBase> detail(
-            @ApiParam(value = "id", required = true) @RequestParam String id
-    ) throws RemoteServiceException {
-        return ResponseHelper.success(partsBaseLogic.detail(id));
-    }
-
-    @PostMapping("/add")
-    @ApiOperation(value = "配件基础-添加")
-    public ResponseHelper<WebsitPartsBase> add(
-            @RequestBody WebsitPartsBase websitPartsBase
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.PARTS_BASE_MANAGE + websitPartsBase.getType());
-        try {
-            if (obtain.tryLock(5, TimeUnit.SECONDS)) {
-                partsBaseLogic.add(websitPartsBase);
-            }
-        } catch(Exception e) {
-            log.error("【配件基础管理处理】失败",e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/edit")
-    @ApiOperation(value = "配件基础-编辑")
-    public ResponseHelper<WebsitPartsBase> edit(
-            @RequestBody WebsitPartsBase websitPartsBase
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.PARTS_BASE_MANAGE + websitPartsBase.getType());
-        try {
-            if (obtain.tryLock(5, TimeUnit.SECONDS)) {
-                partsBaseLogic.edit(websitPartsBase);
-            }
-        } catch(Exception e) {
-            log.error("【配件基础管理处理】失败",e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/config")
-    @ApiOperation(value = "配件基础-配置")
-    public ResponseHelper<MaterialConfig> config() throws Exception {
-
-        MaterialConfig config = partsBaseLogic.config();
-        return ResponseHelper.success(config);
-    }
-
-    @PostMapping("/config/edit")
-    @ApiOperation(value = "配件基础-配置编辑")
-    public ResponseHelper configEdit(
-            @RequestBody MaterialConfig materialConfig
-    ) throws Exception {
-        partsBaseLogic.configEdit(materialConfig);
-        return ResponseHelper.success();
-    }
-
-    @GetMapping("/template/excel")
-    @ApiOperation("模板下载")
-    public void excelDownload(
-            HttpServletResponse response
-    ) throws RemoteServiceException, IOException {
-        String fileName = "配件基础管理模板.xlsx";
-        CommonUtils.downloadFile(fileName,response);
-    }
-
-    @PostMapping("/unit/import")
-    @ApiOperation("导入单位管理")
-    public ResponseHelper importManageUnit(
-            MultipartFile file
-    ) throws Exception {
-        this.commonImportManage(file, PartBaseTypeEnum.UNIT.getKey());
-        return ResponseHelper.success();
-    }
-
-    private void commonImportManage(MultipartFile file, String type) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.PARTS_BASE_MANAGE + type);
-        if (!obtain.tryLock(5, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("冻结中，请稍候再操作...");
-        }
-        try {
-            List<Object> objects = ExcelUtils.importExcel(file);
-            partsBaseLogic.importManage(objects, type);
-        } catch(Exception e) {
-            log.error("【配件基础管理处理】失败",e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-    }
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/material/base/WebsitGoodsAloneController.java

@@ -1,138 +0,0 @@
-package com.gree.mall.manager.controller.material.base;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.material.base.WebsitGoodsAloneBean;
-import com.gree.mall.manager.bean.material.base.WebsitGoodsAloneMVO;
-import com.gree.mall.manager.bean.material.base.WebsitGoodsAlonePVO;
-import com.gree.mall.manager.enums.material.StateEnum;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.material.base.WebsitGoodsAloneLogic;
-import com.gree.mall.manager.zfire.bean.WebsitGoodsParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-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 org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-@Slf4j
-@RestController
-@Api(value = "网点商品开单管理API", tags ={"网点商品开单管理API"} )
-@RequestMapping(value = "/websit/goods/alone", produces = "application/json; charset=utf-8")
-public class WebsitGoodsAloneController {
-
-    @Resource
-    WebsitGoodsAloneLogic websitGoodsAloneLogic;
-
-    @ZfireList
-    @PostMapping("/m/list")
-    @ApiOperation(value = "网点辅材管理-列表")
-    public ResponseHelper<IPage<WebsitGoodsAloneMVO>> mPage(
-            @RequestBody WebsitGoodsParamBean zfireParamBean
-    ) {
-        IPage<WebsitGoodsAloneMVO> page = websitGoodsAloneLogic.mPage(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<WebsitGoodsAloneMVO>() {});
-    }
-
-    @PostMapping("m/list/export")
-    @ApiOperation("网点辅材管理-导出")
-    public void mListExport(
-            @RequestBody WebsitGoodsParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WebsitGoodsAloneMVO> baseVOIPage = websitGoodsAloneLogic.mPage(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @ZfireList
-    @PostMapping("/p/list")
-    @ApiOperation(value = "网点配件管理-列表")
-    public ResponseHelper<IPage<WebsitGoodsAlonePVO>> pPage(
-            @RequestBody WebsitGoodsParamBean zfireParamBean
-    ) {
-        IPage<WebsitGoodsAlonePVO> page = websitGoodsAloneLogic.pPage(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<WebsitGoodsAlonePVO>() {});
-    }
-
-    @PostMapping("p/list/export")
-    @ApiOperation("网点配件管理-导出")
-    public void pListExport(
-            @RequestBody WebsitGoodsParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WebsitGoodsAlonePVO> baseVOIPage = websitGoodsAloneLogic.pPage(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "网点商品管理-详情")
-    public ResponseHelper<WebsitGoodsAloneBean> detail(
-            @ApiParam(value = "id", required = true) @RequestParam String id
-    ) throws RemoteServiceException {
-        WebsitGoodsAloneBean goods = websitGoodsAloneLogic.detail(id);
-        return ResponseHelper.success(goods);
-    }
-
-    @PostMapping("/add")
-    @ApiOperation(value = "网点商品管理-添加")
-    public ResponseHelper<WebsitGoodsAloneBean> add(
-            HttpServletRequest request,
-            @RequestBody WebsitGoodsAloneBean bean
-    ) throws Exception {
-        websitGoodsAloneLogic.add(request, bean);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/edit")
-    @ApiOperation(value = "网点商品管理-编辑")
-    public ResponseHelper<WebsitGoodsAloneBean> edit(
-            HttpServletRequest request,
-            @RequestBody WebsitGoodsAloneBean bean
-    ) throws Exception {
-        websitGoodsAloneLogic.edit(request, bean);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/batch/update/status")
-    @ApiOperation(value = "网点商品管理-批量更新状态")
-    public ResponseHelper batchUpdateStatus(
-            @ApiParam(value = "goodsId", required = true) @RequestParam List<String> ids,
-            @ApiParam(value = "ON=有效 OFF=无效", required = true) @RequestParam StateEnum stateEnum
-    ) throws Exception {
-        websitGoodsAloneLogic.batchUpdateStatus(ids, stateEnum);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/m/import")
-    @ApiOperation(value = "网点商品管理-导入(下载模板:开单辅材模板.xlsx)")
-    public ResponseHelper<String> materialImportData (
-            @RequestPart("file") MultipartFile file
-    ) throws Exception {
-        return ResponseHelper.success(websitGoodsAloneLogic.materialImportData(file));
-    }
-
-    @PostMapping("/p/import")
-    @ApiOperation(value = "网点商品管理-导入(下载模板:开单配件模板.xlsx)")
-    public ResponseHelper<String> partsImportData (
-            @RequestPart("file") MultipartFile file
-    ) throws Exception {
-        return ResponseHelper.success(websitGoodsAloneLogic.partsImportData(file));
-    }
-
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/material/base/WebsitGoodsController.java

@@ -1,146 +0,0 @@
-package com.gree.mall.manager.controller.material.base;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.material.base.WebsitGoodsBean;
-import com.gree.mall.manager.bean.material.base.WebsitGoodsMVO;
-import com.gree.mall.manager.bean.material.base.WebsitGoodsPVO;
-import com.gree.mall.manager.enums.material.StateEnum;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.material.base.WebsitGoodsLogic;
-import com.gree.mall.manager.zfire.bean.WebsitGoodsParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-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 org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-@Slf4j
-@RestController
-@Api(value = "网点商品管理API", tags ={"网点商品管理API"} )
-@RequestMapping(value = "/websit/goods", produces = "application/json; charset=utf-8")
-public class WebsitGoodsController {
-
-    @Resource
-    WebsitGoodsLogic websitGoodsLogic;
-
-    @ZfireList
-    @PostMapping("/m/list")
-    @ApiOperation(value = "网点辅材管理-列表")
-    public ResponseHelper<IPage<WebsitGoodsMVO>> mPage(
-            @RequestBody WebsitGoodsParamBean zfireParamBean
-    ) {
-        IPage<WebsitGoodsMVO> page = websitGoodsLogic.mPage(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<WebsitGoodsMVO>() {});
-    }
-
-    @PostMapping("m/list/export")
-    @ApiOperation("网点辅材管理-导出")
-    public void mListExport(
-            @RequestBody WebsitGoodsParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WebsitGoodsMVO> baseVOIPage = websitGoodsLogic.mPage(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @ZfireList
-    @PostMapping("/p/list")
-    @ApiOperation(value = "网点配件管理-列表")
-    public ResponseHelper<IPage<WebsitGoodsPVO>> pPage(
-            @RequestBody WebsitGoodsParamBean zfireParamBean
-    ) {
-        IPage<WebsitGoodsPVO> page = websitGoodsLogic.pPage(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<WebsitGoodsPVO>() {});
-    }
-
-    @PostMapping("p/list/export")
-    @ApiOperation("网点配件管理-导出")
-    public void pListExport(
-            @RequestBody WebsitGoodsParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WebsitGoodsPVO> baseVOIPage = websitGoodsLogic.pPage(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "网点商品管理-详情")
-    public ResponseHelper<WebsitGoodsBean> detail(
-            @ApiParam(value = "id", required = true) @RequestParam String id
-    ) throws RemoteServiceException {
-        WebsitGoodsBean goods = websitGoodsLogic.detail(id);
-        return ResponseHelper.success(goods);
-    }
-
-    @PostMapping("/add")
-    @ApiOperation(value = "网点商品管理-添加")
-    public ResponseHelper<WebsitGoodsBean> add(
-            HttpServletRequest request,
-            @RequestBody WebsitGoodsBean bean
-    ) throws Exception {
-        websitGoodsLogic.add(request, bean);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/edit")
-    @ApiOperation(value = "网点商品管理-编辑")
-    public ResponseHelper<WebsitGoodsBean> edit(
-            HttpServletRequest request,
-            @RequestBody WebsitGoodsBean bean
-    ) throws Exception {
-        websitGoodsLogic.edit(request, bean);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/batch/update/status")
-    @ApiOperation(value = "网点商品管理-批量更新状态")
-    public ResponseHelper batchUpdateStatus(
-            @ApiParam(value = "goodsId", required = true) @RequestParam List<String> ids,
-            @ApiParam(value = "ON=有效 OFF=无效", required = true) @RequestParam StateEnum stateEnum
-    ) throws Exception {
-        websitGoodsLogic.batchUpdateStatus(ids, stateEnum);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/m/import")
-    @ApiOperation(value = "网点商品管理-导入(下载模板:辅材模板.xlsx)")
-    public ResponseHelper<String> materialImportData (
-            @RequestPart("file") MultipartFile file
-    ) throws Exception {
-        return ResponseHelper.success(websitGoodsLogic.materialImportData(file));
-    }
-
-    @PostMapping("/p/import")
-    @ApiOperation(value = "网点商品管理-导入(下载模板:配件模板（配件物料）.xlsx)")
-    public ResponseHelper<String> partsImportData (
-            @RequestPart("file") MultipartFile file
-    ) throws Exception {
-        return ResponseHelper.success(websitGoodsLogic.partsImportData(file));
-    }
-
-    @PostMapping("/p/import2")
-    @ApiOperation(value = "网点商品管理-导入(下载模板:配件模板（服务收费）.xlsx)")
-    public ResponseHelper<String> partsImportData2 (
-            @RequestPart("file") MultipartFile file
-    ) throws Exception {
-        return ResponseHelper.success(websitGoodsLogic.partsImportData2(file));
-    }
-
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/material/base/WorkerGoodsController.java

@@ -1,107 +0,0 @@
-package com.gree.mall.manager.controller.material.base;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.ExcelData;
-import com.gree.mall.manager.bean.material.base.WorkerGoodsBean;
-import com.gree.mall.manager.bean.material.base.WorkerGoodsVO;
-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.material.base.WorkerGoodsLogic;
-import com.gree.mall.manager.utils.CommonUtils;
-import com.gree.mall.manager.utils.excel.ExcelUtils;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.integration.redis.util.RedisLockRegistry;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-
-@Slf4j
-@RestController
-@Api(value = "师傅辅材管理API", tags ={"师傅辅材管理API"} )
-@RequestMapping(value = "/worker/goods", produces = "application/json; charset=utf-8")
-public class WorkerGoodsController {
-
-    @Resource
-    WorkerGoodsLogic workerGoodsLogic;
-    @Resource
-    RedisLockRegistry redisLockRegistry;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "师傅辅材管理-列表")
-    public ResponseHelper<IPage<WorkerGoodsVO>> page(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<WorkerGoodsVO> page = workerGoodsLogic.page(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<WorkerGoodsVO>() {});
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation("师傅辅材管理-导出")
-    public void listExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WorkerGoodsVO> baseVOIPage = workerGoodsLogic.page(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @GetMapping("/rela/export")
-    @ApiOperation("师傅辅材管理-相关关联辅材")
-    public void downLoadExcel(HttpServletRequest request, HttpServletResponse response) throws Exception {
-        ExcelData excelData = workerGoodsLogic.relaExport();
-        ExcelUtils.exportExcel(request,response, CommonUtils.getCurDateFileName("师傅辅材关联明细", "xlsx"),excelData);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "师傅辅材管理-详情")
-    public ResponseHelper<WorkerGoodsBean> detail(
-            @ApiParam(value = "id", required = true) @RequestParam String id
-    ) throws RemoteServiceException {
-        return ResponseHelper.success(workerGoodsLogic.detail(id));
-    }
-
-    @PostMapping("/add")
-    @ApiOperation(value = "师傅辅材管理-添加")
-    public ResponseHelper add(
-            @RequestBody WorkerGoodsBean bean
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.MATERIAL_WORKER_INCR);
-        try {
-            if (obtain.tryLock(5, TimeUnit.SECONDS)) {
-                workerGoodsLogic.add(bean);
-            }
-        } catch(Exception e) {
-            log.error("【师傅辅材添加】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/edit")
-    @ApiOperation(value = "师傅辅材管理-编辑")
-    public ResponseHelper edit(
-            @RequestBody WorkerGoodsBean bean
-    ) throws Exception {
-        workerGoodsLogic.edit(bean);
-        return ResponseHelper.success();
-    }
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/material/manage/WebsitGoodsPriceController.java

@@ -1,121 +0,0 @@
-package com.gree.mall.manager.controller.material.manage;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.material.manage.WebsitGoodsPriceVO;
-import com.gree.mall.manager.bean.material.manage.WebsitPriceUpdBean;
-import com.gree.mall.manager.bean.material.manage.WebsitPriceUpdVO;
-import com.gree.mall.manager.enums.material.MaterialFlagEnum;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.material.manage.WebsitGoodsPriceLogic;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
-@Slf4j
-@RestController
-@Api(value = "网点价格管理API", tags ={"网点价格管理API"} )
-@Validated
-@RequestMapping(value = "/websit/goods/price", produces = "application/json; charset=utf-8")
-public class WebsitGoodsPriceController {
-
-    @Resource
-    WebsitGoodsPriceLogic websitGoodsPriceLogic;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "网点价格管理-列表")
-    public ResponseHelper<IPage<WebsitGoodsPriceVO>> page(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<WebsitGoodsPriceVO> page = websitGoodsPriceLogic.page(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<WebsitGoodsPriceVO>() {});
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation("网点价格管理-导出")
-    public void listExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WebsitGoodsPriceVO> baseVOIPage = websitGoodsPriceLogic.page(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @ZfireList
-    @PostMapping("upd/list")
-    @ApiOperation(value = "网点调价管理-列表")
-    public ResponseHelper<IPage<WebsitPriceUpdVO>> updPage(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<WebsitPriceUpdVO> page = websitGoodsPriceLogic.updPage(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<WebsitPriceUpdVO>() {});
-    }
-
-    @PostMapping("upd/list/export")
-    @ApiOperation("网点调价管理-导出")
-    public void updListExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WebsitPriceUpdVO> baseVOIPage = websitGoodsPriceLogic.updPage(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "网点调价管理-详情")
-    public ResponseHelper<WebsitPriceUpdBean> detail(
-            @ApiParam(value = "sheetId", required = true) @RequestParam String sheetId
-    ) throws RemoteServiceException {
-        WebsitPriceUpdBean bean = websitGoodsPriceLogic.detail(sheetId);
-        return ResponseHelper.success(bean);
-    }
-
-    @PostMapping("/add")
-    @ApiOperation(value = "网点调价管理-添加")
-    public ResponseHelper add(
-            @Valid @RequestBody WebsitPriceUpdBean bean
-    ) throws Exception {
-        websitGoodsPriceLogic.add(bean);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/edit")
-    @ApiOperation(value = "网点调价管理-编辑")
-    public ResponseHelper edit(
-            @Valid @RequestBody WebsitPriceUpdBean bean
-    ) throws Exception {
-        websitGoodsPriceLogic.edit(bean);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/confirm")
-    @ApiOperation(value = "网点调价管理-审核")
-    public ResponseHelper confirm(
-            @ApiParam(value = "单号", required = true) @NotBlank(message = "单号不能为空") @RequestParam String sheetId,
-            @ApiParam(value = "审核结果 OK=通过 FAIL=失败", required = true) @NotNull(message = "审核结果不能为空") @RequestParam MaterialFlagEnum flag
-    ) throws Exception {
-        websitGoodsPriceLogic.confirm(sheetId, flag);
-        return ResponseHelper.success();
-    }
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/material/manage/WebsitPartsChangeSalesController.java

@@ -1,90 +0,0 @@
-package com.gree.mall.manager.controller.material.manage;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.material.manage.WebsitPartsChangeSalesVO;
-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.material.manage.WebsitPartsChangeSalesLogic;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.integration.redis.util.RedisLockRegistry;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-
-@Slf4j
-@RestController
-@Api(value = "新件转销售", tags = {"新件转销售"})
-@RequestMapping(value = "/parts/change-sales", produces = "application/json; charset=utf-8")
-public class WebsitPartsChangeSalesController {
-
-    @Resource
-    WebsitPartsChangeSalesLogic websitPartsChangeSalesLogic;
-    @Resource
-    RedisLockRegistry redisLockRegistry;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation("新件转销售列表")
-    public ResponseHelper<IPage<WebsitPartsChangeSalesVO>> list(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) throws RemoteServiceException {
-        IPage<WebsitPartsChangeSalesVO> partsBeanIPage = websitPartsChangeSalesLogic.pageList(zfireParamBean);
-        return ResponseHelper.success(partsBeanIPage, new TypeReference<WebsitPartsChangeSalesVO>() {
-        });
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation("新件转销售导出")
-    public void listExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WebsitPartsChangeSalesVO> stockBeanIPage = websitPartsChangeSalesLogic.pageList(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(stockBeanIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "新件转销售详情")
-    public ResponseHelper detail(
-            @ApiParam(value = "转销单号", required = true) @RequestParam String changeSalesNo
-    ) throws RemoteServiceException {
-        return ResponseHelper.success(websitPartsChangeSalesLogic.detail(changeSalesNo));
-    }
-
-    @PostMapping("/examine")
-    @ApiOperation(value = "新件转销售审批")
-    public ResponseHelper refund(
-            @ApiParam(value = "转销单号", required = true) @RequestParam String changeSalesNo,
-            @ApiParam(value = "审核结果 AGREE=通过 REJECT=驳回", required = true) @RequestParam String flag,
-            @ApiParam(value = "审批备注") @RequestParam(required = false) String examineRemark
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.NEW_CHANGE + changeSalesNo);
-        try {
-            if (obtain.tryLock(5, TimeUnit.SECONDS)) {
-                websitPartsChangeSalesLogic.examine(changeSalesNo, flag, examineRemark);
-            }
-        } catch (Exception e) {
-            log.error("【新件转销售处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success();
-    }
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/material/manage/WebsitPartsConfigController.java

@@ -1,80 +0,0 @@
-package com.gree.mall.manager.controller.material.manage;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.material.manage.WebsitPartsConfigBean;
-import com.gree.mall.manager.bean.material.manage.WebsitPartsConfigVO;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.material.manage.WebsitPartsConfigLogic;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-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 java.util.List;
-
-@Slf4j
-@RestController
-@Api(value = "配件配置", tags ={"配件配置"} )
-@RequestMapping(value = "/parts/refund/config", produces = "application/json; charset=utf-8")
-public class WebsitPartsConfigController {
-
-    @Resource
-    WebsitPartsConfigLogic websitPartsConfigLogic;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "配件返还配置-列表")
-    public ResponseHelper<IPage<WebsitPartsConfigVO>> page(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<WebsitPartsConfigVO> page = websitPartsConfigLogic.page(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<WebsitPartsConfigVO>() {});
-    }
-
-    @PostMapping("/get/default")
-    @ApiOperation(value = "配件返还配置-获取默认数据")
-    public ResponseHelper<WebsitPartsConfigBean> getDefault() {
-        WebsitPartsConfigBean bean = websitPartsConfigLogic.getDefault();
-        return ResponseHelper.success(bean);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation("配件返还配置详情")
-    public ResponseHelper<WebsitPartsConfigBean> detail(
-            @ApiParam(value = "id", required = true) @RequestParam String id
-    ) throws Exception {
-        return ResponseHelper.success(websitPartsConfigLogic.detail(id));
-    }
-
-    @PostMapping("/add")
-    @ApiOperation("配件返还配置添加")
-    public ResponseHelper add(@RequestBody WebsitPartsConfigBean bean) throws Exception {
-
-        websitPartsConfigLogic.add(bean);
-
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/edit")
-    @ApiOperation("配件返还配置编辑")
-    public ResponseHelper edit(@RequestBody WebsitPartsConfigBean bean) throws Exception {
-
-        websitPartsConfigLogic.edit(bean);
-
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/batch/del")
-    @ApiOperation("配件返还配置批量删除")
-    public ResponseHelper batchDel(@RequestBody List<String> ids) throws Exception {
-
-        websitPartsConfigLogic.batchDel(ids);
-
-        return ResponseHelper.success();
-    }
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/material/manage/WebsitPartsCreditController.java

@@ -1,132 +0,0 @@
-package com.gree.mall.manager.controller.material.manage;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.PayDetail;
-import com.gree.mall.manager.bean.material.manage.WebsitPartsCreditBean;
-import com.gree.mall.manager.bean.material.manage.WebsitPartsCreditItemVO;
-import com.gree.mall.manager.bean.material.manage.WebsitPartsCreditVO;
-import com.gree.mall.manager.bean.material.manage.WebsitPartsSalesBean;
-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.material.manage.WebsitPartsCreditLogic;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.integration.redis.util.RedisLockRegistry;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-
-@Slf4j
-@RestController
-@Api(value = "网点配件记账管理", tags ={"网点配件记账管理"} )
-@RequestMapping(value = "/parts/credit", produces = "application/json; charset=utf-8")
-public class WebsitPartsCreditController {
-
-    @Resource
-    WebsitPartsCreditLogic websitPartsCreditLogic;
-    @Resource
-    RedisLockRegistry redisLockRegistry;
-
-    @ZfireList
-    @PostMapping("/gather/list")
-    @ApiOperation(value = "网点汇总记账-列表")
-    public ResponseHelper<IPage<WebsitPartsCreditVO>> gatherPage(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<WebsitPartsCreditVO> page = websitPartsCreditLogic.gatherPage(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<WebsitPartsCreditVO>() {});
-    }
-
-    @PostMapping("/gather/list/export")
-    @ApiOperation("网点汇总记账-列表导出")
-    public void gatherListExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WebsitPartsCreditVO> baseVOIPage = websitPartsCreditLogic.gatherPage(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "网点记账-列表")
-    public ResponseHelper<IPage<WebsitPartsCreditItemVO>> page(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<WebsitPartsCreditItemVO> page = websitPartsCreditLogic.page(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<WebsitPartsCreditItemVO>() {});
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation("网点记账-列表导出")
-    public void listExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WebsitPartsCreditItemVO> baseVOIPage = websitPartsCreditLogic.page(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation("网点记账-详情")
-    public ResponseHelper<WebsitPartsCreditBean> detail(
-            @ApiParam(value = "id", required = true) @RequestParam String id
-    ) throws Exception {
-        WebsitPartsCreditBean bean = websitPartsCreditLogic.detail(id);
-        return ResponseHelper.success(bean);
-    }
-
-    @PostMapping("/update")
-    @ApiOperation("网点记账-更新备注")
-    public ResponseHelper update(
-            @ApiParam(value = "id", required = true) @RequestParam String id,
-            @ApiParam(value = "备注") @RequestParam(required = false) String remark
-    ) throws Exception {
-        websitPartsCreditLogic.update(id, remark);
-        return ResponseHelper.success();
-    }
-
-    @ApiOperation(value = "生成支付二维码")
-    @PostMapping("/code")
-    public ResponseHelper<PayDetail> generateCode(
-            @ApiParam(value = "记账id", required = true) @RequestParam String id,
-            @ApiParam(value = "网点支付配置id") @RequestParam(required = false) String payConfigId
-    ) throws Exception {
-        return ResponseHelper.success(websitPartsCreditLogic.generateCode(id, payConfigId));
-    }
-
-    @ApiOperation("现金支付")
-    @PostMapping("/change-cash")
-    public ResponseHelper<WebsitPartsSalesBean> changeCash(@ApiParam(value = "记账id", required = true) @RequestParam String id) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.PARTS_SALES + id);
-        if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("记账记录冻结中");
-        }
-        try {
-            websitPartsCreditLogic.changeCash(id);
-            return ResponseHelper.success();
-        } catch (Exception e) {
-            log.error("【记账记录处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-    }
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/material/manage/WebsitPartsNewInController.java

@@ -1,149 +0,0 @@
-package com.gree.mall.manager.controller.material.manage;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.material.manage.WebsitNewInListBean;
-import com.gree.mall.manager.bean.material.manage.WebsitPartsNewInVO;
-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.material.manage.WebsitPartsNewInLogic;
-import com.gree.mall.manager.utils.excel.ExcelUtils;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.integration.redis.util.RedisLockRegistry;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-
-@Slf4j
-@RestController
-@Api(value = "网点新件入库记录", tags ={"网点新件入库记录"} )
-@RequestMapping(value = "/websit/parts/new-in", produces = "application/json; charset=utf-8")
-public class WebsitPartsNewInController {
-
-    @Resource
-    WebsitPartsNewInLogic websitPartsNewInLogic;
-    @Resource
-    RedisLockRegistry redisLockRegistry;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation("列表")
-    public ResponseHelper<IPage<WebsitPartsNewInVO>> list(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) throws RemoteServiceException {
-        IPage<WebsitPartsNewInVO> partsBeanIPage = websitPartsNewInLogic.pageList(zfireParamBean);
-        return ResponseHelper.success(partsBeanIPage, new TypeReference<WebsitPartsNewInVO>() {});
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation("列表导出")
-    public void listExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WebsitPartsNewInVO> baseVOIPage = websitPartsNewInLogic.pageList(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @PostMapping("/import")
-    @ApiOperation("导入网点新件入库记录")
-    public ResponseHelper importOldOut(
-            MultipartFile file
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.NEW_IN + "add");
-        if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("请稍候再导入...");
-        }
-        try {
-            List<Object> objects = ExcelUtils.importExcel(file);
-            websitPartsNewInLogic.importNewIn(objects);
-        } catch(Exception e) {
-            log.error("【网点新件入库记录处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-        return ResponseHelper.success();
-    }
-
-    @ApiOperation(value = "新增网点新件入库记录")
-    @PostMapping("/add")
-    public ResponseHelper add(
-            @ApiParam(required = true, value = "网点新件入库记录") @RequestBody List<WebsitNewInListBean> websitNewInListBean
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.NEW_IN + "add");
-        if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("请稍候再操作...");
-        }
-        try {
-            websitPartsNewInLogic.add(websitNewInListBean);
-        } catch(Exception e) {
-            log.error("【网点新件入库记录处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success();
-    }
-
-    @ApiOperation(value = "更新网点新件入库记录")
-    @PostMapping("/update")
-    public ResponseHelper updateIn(
-            @ApiParam(required = true, value = "网点新件入库记录id") @RequestParam List<String> ids
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.NEW_IN + "add");
-        if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("请稍候再操作...");
-        }
-        try {
-            websitPartsNewInLogic.updateIn(ids);
-        } catch(Exception e) {
-            log.error("【网点新件入库记录处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success();
-    }
-
-    @ApiOperation(value = "删除网点新件入库记录")
-    @PostMapping("/del")
-    public ResponseHelper delNewIn(
-            @ApiParam(required = true, value = "网点新件入库记录id") @RequestParam List<String> ids
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.NEW_IN + "add");
-        if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("请稍候再操作...");
-        }
-        try {
-            websitPartsNewInLogic.delNewIn(ids);
-        } catch(Exception e) {
-            log.error("【网点旧件出库记录处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success();
-    }
-
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/material/manage/WebsitPartsOldOutController.java

@@ -1,136 +0,0 @@
-package com.gree.mall.manager.controller.material.manage;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.material.manage.WebsitPartsOldOutVO;
-import com.gree.mall.manager.bean.material.manage.WebsitStockOutListBean;
-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.material.manage.WebsitPartsOldOutLogic;
-import com.gree.mall.manager.utils.excel.ExcelUtils;
-import com.gree.mall.manager.zfire.bean.PartsParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.integration.redis.util.RedisLockRegistry;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-
-@Slf4j
-@RestController
-@Api(value = "网点旧件出库记录", tags ={"网点旧件出库记录"} )
-@RequestMapping(value = "/parts/old-out", produces = "application/json; charset=utf-8")
-public class WebsitPartsOldOutController {
-
-    @Resource
-    WebsitPartsOldOutLogic websitPartsOldOutLogic;
-    @Resource
-    RedisLockRegistry redisLockRegistry;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation("网点旧件出库记录列表")
-    public ResponseHelper<IPage<WebsitPartsOldOutVO>> list(
-            @RequestBody PartsParamBean zfireParamBean
-    ) throws RemoteServiceException {
-        IPage<WebsitPartsOldOutVO> partsBeanIPage = websitPartsOldOutLogic.pageList(zfireParamBean);
-        return ResponseHelper.success(partsBeanIPage, new TypeReference<WebsitPartsOldOutVO>() {});
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation("网点旧件出库记录列表导出")
-    public void listExport(
-            @RequestBody PartsParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WebsitPartsOldOutVO> stockBeanIPage = websitPartsOldOutLogic.pageList(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(stockBeanIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @ApiOperation(value = "新增网点新旧件出库记录")
-    @PostMapping("/add")
-    public ResponseHelper add(
-            @ApiParam(required = true, value = "网点出库记录") @RequestBody List<WebsitStockOutListBean> beans
-    ) throws Exception {
-        websitPartsOldOutLogic.add(beans);
-        return ResponseHelper.success();
-    }
-
-    @ApiOperation(value = "审核网点新旧件出库记录")
-    @PostMapping("/confirm")
-    public ResponseHelper confirm(
-            @ApiParam(required = true, value = "网点出库记录") @RequestBody List<String> ids
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.OLD_OUT + "add");
-        if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("请稍候, 正在审核中");
-        }
-        try {
-            websitPartsOldOutLogic.confirm(ids);
-        } catch(Exception e) {
-            log.error("【网点旧件出库记录处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("/import")
-    @ApiOperation("导入网点旧件出库记录")
-    public ResponseHelper importOldOut(
-            MultipartFile file
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.OLD_OUT + "add");
-        if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("请稍候再导入...");
-        }
-        try {
-            List<Object> objects = ExcelUtils.importExcel(file);
-            websitPartsOldOutLogic.importOldOut(objects);
-        } catch(Exception e) {
-            log.error("【网点旧件出库记录处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-        return ResponseHelper.success();
-    }
-
-    @ApiOperation(value = "删除网点旧件出库记录")
-    @PostMapping("/del")
-    public ResponseHelper delOldOut(
-            @ApiParam(required = true, value = "网点旧件出库记录id") @RequestParam List<String> ids
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.OLD_OUT + "add");
-        if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("请稍候再操作...");
-        }
-        try {
-            websitPartsOldOutLogic.delOldOut(ids);
-        } catch(Exception e) {
-            log.error("【网点旧件出库记录处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success();
-    }
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/material/manage/WebsitPartsSalesOrderController.java

@@ -1,300 +0,0 @@
-package com.gree.mall.manager.controller.material.manage;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.PayDetail;
-import com.gree.mall.manager.bean.material.manage.WebsitPartsSalesBean;
-import com.gree.mall.manager.bean.material.manage.WebsitPartsSalesVO;
-import com.gree.mall.manager.bean.material.manage.WebsitPartsSalesWVO;
-import com.gree.mall.manager.constant.Constant;
-import com.gree.mall.manager.enums.IsEnum;
-import com.gree.mall.manager.enums.material.SourceSalesEnum;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.material.manage.WebsitPartsSalesOrderLogic;
-import com.gree.mall.manager.plus.entity.WebsitSalesPayOrder;
-import com.gree.mall.manager.plus.entity.WebsitStock;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.integration.redis.util.RedisLockRegistry;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-
-@Slf4j
-@RestController
-@Api(value = "网点配件销售单", tags = {"网点配件销售单"})
-@RequestMapping(value = "/parts/sales/order", produces = "application/json; charset=utf-8")
-public class WebsitPartsSalesOrderController {
-
-    @Resource
-    WebsitPartsSalesOrderLogic websitPartsSalesOrderLogic;
-
-    @Resource
-    RedisLockRegistry redisLockRegistry;
-
-    @ApiOperation("配件销售单新增")
-    @PostMapping("/add")
-    public ResponseHelper<WebsitPartsSalesBean> add(
-            @RequestBody WebsitPartsSalesBean partsSalesOrderBean
-    ) throws Exception {
-        partsSalesOrderBean.setOrderSource(SourceSalesEnum.SELF.getKey());
-        partsSalesOrderBean.setIsApply(IsEnum.N.getValue());
-        websitPartsSalesOrderLogic.add(partsSalesOrderBean);
-        return ResponseHelper.success(partsSalesOrderBean);
-    }
-
-    @ApiOperation("配件销售单修改")
-    @PostMapping("/update")
-    public ResponseHelper<WebsitPartsSalesBean> update(
-            @RequestBody WebsitPartsSalesBean partsSalesOrderBean
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.PARTS_SALES + partsSalesOrderBean.getId());
-        if (!obtain.tryLock(5, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("配件销售单冻结中");
-        }
-        try {
-            websitPartsSalesOrderLogic.update(partsSalesOrderBean);
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success(partsSalesOrderBean);
-    }
-
-    @ApiOperation("配件销售单根据id获取")
-    @PostMapping("/loadSalesOrderById")
-    public ResponseHelper<WebsitPartsSalesBean> loadSalesOrderById(
-            @RequestParam String id
-    ) throws RemoteServiceException {
-        return ResponseHelper.success(websitPartsSalesOrderLogic.loadSalesOrderById(id));
-    }
-
-    @ZfireList
-    @ApiOperation("配件销售列表")
-    @PostMapping("/list")
-    public ResponseHelper<IPage<WebsitPartsSalesVO>> list(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) throws RemoteServiceException {
-        IPage<WebsitPartsSalesVO> partsSalesOrderBeanIPage = websitPartsSalesOrderLogic.list(zfireParamBean);
-        return ResponseHelper.success(partsSalesOrderBeanIPage, new TypeReference<WebsitPartsSalesVO>() {
-        });
-    }
-
-    @ZfireList
-    @ApiOperation("网点配件销售列表")
-    @PostMapping("/websit/list")
-    public ResponseHelper<IPage<WebsitPartsSalesWVO>> websitList(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) throws RemoteServiceException {
-        IPage<WebsitPartsSalesWVO> partsSalesOrderBeanIPage = websitPartsSalesOrderLogic.websitList(zfireParamBean);
-        return ResponseHelper.success(partsSalesOrderBeanIPage, new TypeReference<WebsitPartsSalesWVO>() {
-        });
-    }
-
-    @ApiOperation(value = "生成支付二维码")
-    @PostMapping("/code")
-    public ResponseHelper<PayDetail> generateCode(
-            @ApiParam(value = "网点销售单id", required = true) @RequestParam String id,
-            @ApiParam(value = "网点支付配置id") @RequestParam(required = false) String payConfigId
-    ) throws Exception {
-        return ResponseHelper.success(websitPartsSalesOrderLogic.generateCode(id, payConfigId));
-    }
-
-    @ApiOperation(value = "查询二维码支付状态")
-    @GetMapping("/query/pay/status")
-    public ResponseHelper<WebsitSalesPayOrder> queryPayStatus(
-            @ApiParam(value = "网点编号",required = true) @RequestParam String websitId,
-            @ApiParam(value = "单据号",required = true) @RequestParam String id,
-            @ApiParam(value = "商户订单号",required = true) @RequestParam String outTradeNo
-    ) throws Exception {
-        return ResponseHelper.success(websitPartsSalesOrderLogic.queryPayStatus(websitId, id, outTradeNo));
-    }
-
-    @ApiOperation("配件销售列表导出")
-    @PostMapping("/list/export")
-    public void listExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WebsitPartsSalesVO> partsSalesOrderBeanIPage = websitPartsSalesOrderLogic.list(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(partsSalesOrderBeanIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @ApiOperation("网点配件销售列表导出")
-    @PostMapping("/websit/list/export")
-    public void shopListExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WebsitPartsSalesWVO> partsSalesOrderBeanIPage = websitPartsSalesOrderLogic.websitList(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(partsSalesOrderBeanIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @ApiOperation("提交订单")
-    @PostMapping("/submit")
-    public ResponseHelper<WebsitPartsSalesBean> submit(@ApiParam(value = "销售单id", required = true) @RequestParam String id) throws InterruptedException {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.PARTS_SALES + id);
-        if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("销售单冻结中");
-        }
-        try {
-            return ResponseHelper.success(websitPartsSalesOrderLogic.submit(id));
-        } catch (Exception e) {
-            log.error("【提交订单处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-    }
-
-    @ApiOperation("现金支付")
-    @PostMapping("/change-cash")
-    public ResponseHelper<WebsitPartsSalesBean> changeCash(@ApiParam(value = "销售单号", required = true) @RequestParam String id) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.PARTS_SALES + id);
-        if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("销售单冻结中");
-        }
-        try {
-            return ResponseHelper.success(websitPartsSalesOrderLogic.changeCash(id));
-        } catch (Exception e) {
-            log.error("【提交订单处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-    }
-
-    @ApiOperation("记账")
-    @PostMapping("/change-credit")
-    public ResponseHelper<WebsitPartsSalesBean> changeCredit(@ApiParam(value = "销售单号", required = true) @RequestParam String id) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.PARTS_SALES + id);
-        if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("销售单冻结中");
-        }
-        try {
-            return ResponseHelper.success(websitPartsSalesOrderLogic.changeCredit(id));
-        } catch (Exception e) {
-            log.error("【提交订单处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-    }
-
-    @ApiOperation("网点提货")
-    @PostMapping("/confirm/delivery")
-    public ResponseHelper confirmDelivery(
-            @ApiParam(value = "销售单号", required = true) @RequestParam String id,
-            @ApiParam(value = "物流单号") @RequestParam(required = false) String logisticsNo
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.PARTS_SALES + id);
-        if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("销售单冻结中");
-        }
-        try {
-            websitPartsSalesOrderLogic.confirmDelivery(id, logisticsNo);
-        } catch (Exception e) {
-            log.error("【网点提货处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success();
-    }
-
-    @ApiOperation("删除")
-    @PostMapping("/deleteById")
-    public ResponseHelper deleteById(
-            @ApiParam(value = "销售单id", required = true) @RequestParam String id
-    ) throws RemoteServiceException {
-        websitPartsSalesOrderLogic.deleteById(id);
-        return ResponseHelper.success();
-    }
-
-    @ApiOperation("退回-保存状态")
-    @PostMapping("/backToSave")
-    public ResponseHelper<WebsitPartsSalesBean> backToSave(
-            @RequestParam String id
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.PARTS_SALES + id);
-        if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("销售单冻结中");
-        }
-        try {
-            return ResponseHelper.success(websitPartsSalesOrderLogic.backToSave(id));
-        } catch (Exception e) {
-            log.error("【网点退回保存处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-
-    }
-
-    @ApiOperation("取消订单")
-    @PostMapping("/cancel")
-    public ResponseHelper cancel(@RequestParam String id) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.PARTS_SALES + id);
-        if (!obtain.tryLock(5, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("配件销售单冻结中");
-        }
-        try {
-            websitPartsSalesOrderLogic.cancel(id);
-        } catch (Exception e) {
-            log.error("【取消订单处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success();
-    }
-
-    @ApiOperation("获取配件可用库存")
-    @PostMapping("/query/parts/new/qty")
-    public ResponseHelper<WebsitStock> queryPartsNewQty(
-            @ApiParam(required = true, value = "网点编码") @RequestParam String websitId,
-            @ApiParam(required = true, value = "配件网点编号") @RequestParam String partsWebsitId,
-            @ApiParam(required = true, value = "配件编码") @RequestParam String partsNumber
-    ) {
-        return ResponseHelper.success(websitPartsSalesOrderLogic.queryPartsNewQty(websitId, partsWebsitId, partsNumber));
-    }
-
-    @ApiOperation("转换非申请")
-    @PostMapping("/trans/not/apply")
-    public ResponseHelper transNotApply(@RequestParam String id) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.PARTS_SALES + id);
-        if (!obtain.tryLock(5, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("配件销售申请单冻结中");
-        }
-        try {
-            websitPartsSalesOrderLogic.transNotApply(id);
-        } catch (Exception e) {
-            log.error("【转换非申请处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success();
-    }
-
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/material/manage/WebsitPurchaseAdjustmentController.java

@@ -1,159 +0,0 @@
-package com.gree.mall.manager.controller.material.manage;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.material.manage.WebsitPurchaseAdjustmentBean;
-import com.gree.mall.manager.bean.material.manage.WebsitPurchaseAdjustmentVO;
-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.material.manage.WebsitPurchaseAdjustmentLogic;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.integration.redis.util.RedisLockRegistry;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-
-@Slf4j
-@RestController
-@Api(value = "网点采购调整API", tags ={"网点采购调整API"} )
-@Validated
-@RequestMapping(value = "/websit/purchase/adjustment", produces = "application/json; charset=utf-8")
-public class WebsitPurchaseAdjustmentController {
-
-    @Resource
-    WebsitPurchaseAdjustmentLogic websitPurchaseAdjustmentLogic;
-    @Resource
-    RedisLockRegistry redisLockRegistry;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "网点采购调整-列表")
-    public ResponseHelper<IPage<WebsitPurchaseAdjustmentVO>> page(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<WebsitPurchaseAdjustmentVO> page = websitPurchaseAdjustmentLogic.page(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<WebsitPurchaseAdjustmentVO>() {});
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation("网点采购调整-导出")
-    public void listExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WebsitPurchaseAdjustmentVO> baseVOIPage = websitPurchaseAdjustmentLogic.page(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "网点采购调整-详情")
-    public ResponseHelper<WebsitPurchaseAdjustmentBean> detail(
-            @ApiParam(value = "purchaseAdjustmentId", required = true) @RequestParam String purchaseAdjustmentId
-    ) throws RemoteServiceException {
-        WebsitPurchaseAdjustmentBean bean = websitPurchaseAdjustmentLogic.detail(purchaseAdjustmentId);
-        return ResponseHelper.success(bean);
-    }
-
-    @PostMapping("/add")
-    @ApiOperation(value = "网点采购调整-添加")
-    public ResponseHelper<WebsitPurchaseAdjustmentBean> add(
-            @RequestBody WebsitPurchaseAdjustmentBean bean
-    ) throws Exception {
-        WebsitPurchaseAdjustmentBean result;
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LOCK_MATERIAL_PURCHASE + bean.getRef());
-        if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("系统繁忙，请稍后再尝试");
-        }
-        try {
-            result = websitPurchaseAdjustmentLogic.add(bean);
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success(result);
-    }
-
-    @PostMapping("/update")
-    @ApiOperation(value = "修改采购调整单")
-    public ResponseHelper update(@RequestBody WebsitPurchaseAdjustmentBean purchaseAdjustmentBean) throws RemoteServiceException {
-        websitPurchaseAdjustmentLogic.update(purchaseAdjustmentBean);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/submit")
-    @ApiOperation(value = "采购调整单提交")
-    public ResponseHelper submit(
-            @ApiParam(value = "采购调整单id",required = true) @RequestParam String purchaseAdjustmentId
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LOCK_MATERIAL_PURCHASE + purchaseAdjustmentId);
-        if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("系统繁忙，请稍后再尝试");
-        }
-        try {
-            websitPurchaseAdjustmentLogic.submit(purchaseAdjustmentId);
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/revoke")
-    @ApiOperation(value = "采购调整单撤消")
-    public ResponseHelper revoke(
-            @ApiParam(value = "采购调整单id",required = true) @RequestParam String purchaseAdjustmentId
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LOCK_MATERIAL_PURCHASE + purchaseAdjustmentId);
-        if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("系统繁忙，请稍后再尝试");
-        }
-        try {
-            websitPurchaseAdjustmentLogic.revoke(purchaseAdjustmentId);
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/del")
-    @ApiOperation(value = "采购调整单删除")
-    public ResponseHelper del(@ApiParam(value = "采购调整单id",required = true) @RequestParam String purchaseAdjustmentId)
-            throws RemoteServiceException {
-        websitPurchaseAdjustmentLogic.del(purchaseAdjustmentId);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/confirm")
-    @ApiOperation(value = "采购调整单审核")
-    public ResponseHelper confirm(
-            @ApiParam(value = "采购调整单id",required = true) @RequestParam String purchaseAdjustmentId
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LOCK_MATERIAL_PURCHASE + purchaseAdjustmentId);
-        if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("系统繁忙，请稍后再尝试");
-        }
-        try {
-            websitPurchaseAdjustmentLogic.confirm(purchaseAdjustmentId);
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success();
-    }
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/material/manage/WebsitPurchaseApplyController.java

@@ -1,133 +0,0 @@
-package com.gree.mall.manager.controller.material.manage;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.material.manage.WebsitMPurchaseBean;
-import com.gree.mall.manager.bean.material.manage.WebsitPurchaseApplyVO;
-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.material.manage.WebsitMPurchaseLogic;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.integration.redis.util.RedisLockRegistry;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-
-@Slf4j
-@RestController
-@Api(value = "网点采购申请API", tags ={"网点采购申请API"} )
-@Validated
-@RequestMapping(value = "/websit/purchase/apply", produces = "application/json; charset=utf-8")
-public class WebsitPurchaseApplyController {
-
-    @Resource
-    WebsitMPurchaseLogic websitMPurchaseLogic;
-    @Resource
-    RedisLockRegistry redisLockRegistry;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "网点采购申请-列表")
-    public ResponseHelper<IPage<WebsitPurchaseApplyVO>> page(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<WebsitPurchaseApplyVO> page = websitMPurchaseLogic.page(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<WebsitPurchaseApplyVO>() {});
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation("网点采购申请-导出")
-    public void listExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WebsitPurchaseApplyVO> baseVOIPage = websitMPurchaseLogic.page(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "网点采购申请-详情")
-    public ResponseHelper<WebsitMPurchaseBean> detail(
-            @ApiParam(value = "purchaseId", required = true) @RequestParam String purchaseId
-    ) throws RemoteServiceException {
-        WebsitMPurchaseBean bean = websitMPurchaseLogic.detail(purchaseId);
-        return ResponseHelper.success(bean);
-    }
-
-    @PostMapping("/add")
-    @ApiOperation(value = "网点采购申请-添加")
-    public ResponseHelper add(
-            @RequestBody WebsitMPurchaseBean bean
-    ) throws Exception {
-        websitMPurchaseLogic.add(bean);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/edit")
-    @ApiOperation(value = "网点采购申请-编辑")
-    public ResponseHelper edit(
-            @RequestBody WebsitMPurchaseBean bean
-    ) throws Exception {
-        websitMPurchaseLogic.edit(bean);
-
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/batch/del")
-    @ApiOperation(value = "网点采购申请-批量删除")
-    public ResponseHelper batchDel(@RequestBody List<String> purchaseIds)
-            throws RemoteServiceException {
-        websitMPurchaseLogic.batchDel(purchaseIds);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/revoke")
-    @ApiOperation(value = "网点采购申请-撤消")
-    public ResponseHelper revoke(@ApiParam(value = "采购申请单id",required = true) @RequestParam String purchaseId)
-            throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LOCK_MATERIAL_PURCHASE + purchaseId);
-        if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("系统繁忙，请稍后再尝试");
-        }
-        try {
-            websitMPurchaseLogic.revoke(purchaseId, 1);
-        } finally {
-            obtain.unlock();
-        }
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/submit")
-    @ApiOperation(value = "网点采购申请-提交")
-    public ResponseHelper submit(@ApiParam(value = "采购申请单id",required = true) @RequestParam String purchaseId)
-            throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LOCK_MATERIAL_PURCHASE + purchaseId);
-        if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("系统繁忙，请稍后再尝试");
-        }
-        try {
-            websitMPurchaseLogic.submit(purchaseId);
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success();
-    }
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/material/manage/WebsitPurchaseController.java

@@ -1,213 +0,0 @@
-package com.gree.mall.manager.controller.material.manage;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.material.manage.WebsitMPurchaseBean;
-import com.gree.mall.manager.bean.material.manage.WebsitPurchaseBean;
-import com.gree.mall.manager.bean.material.manage.WebsitPurchaseOrderVO;
-import com.gree.mall.manager.bean.material.manage.WebsitPurchaseVO;
-import com.gree.mall.manager.constant.Constant;
-import com.gree.mall.manager.enums.material.MaterialFlagEnum;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.material.manage.WebsitMPurchaseLogic;
-import com.gree.mall.manager.logic.material.manage.WebsitPurchaseLogic;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.integration.redis.util.RedisLockRegistry;
-import org.springframework.validation.annotation.Validated;
-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.validation.Valid;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-
-@Slf4j
-@RestController
-@Api(value = "网点采购入库API", tags ={"网点采购入库API"} )
-@Validated
-@RequestMapping(value = "/websit/purchase/in", produces = "application/json; charset=utf-8")
-public class WebsitPurchaseController {
-
-    @Resource
-    WebsitPurchaseLogic websitPurchaseLogic;
-    @Resource
-    RedisLockRegistry redisLockRegistry;
-    @Resource
-    WebsitMPurchaseLogic websitMPurchaseLogic;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "网点采购入库-列表")
-    public ResponseHelper<IPage<WebsitPurchaseVO>> page(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<WebsitPurchaseVO> page = websitPurchaseLogic.page(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<WebsitPurchaseVO>() {});
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation("网点采购入库-导出")
-    public void listExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WebsitPurchaseVO> baseVOIPage = websitPurchaseLogic.page(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "网点采购入库-详情")
-    public ResponseHelper<WebsitPurchaseBean> detail(
-            @ApiParam(value = "purchaseId", required = true) @RequestParam String purchaseId
-    ) throws RemoteServiceException {
-        WebsitPurchaseBean bean = websitPurchaseLogic.detail(purchaseId);
-        return ResponseHelper.success(bean);
-    }
-
-    @PostMapping("/add")
-    @ApiOperation(value = "网点采购入库-添加")
-    public ResponseHelper add(
-            @Valid @RequestBody WebsitPurchaseBean bean
-    ) throws Exception {
-        websitPurchaseLogic.add(bean);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/edit")
-    @ApiOperation(value = "网点采购入库-编辑")
-    public ResponseHelper edit(
-            @Valid @RequestBody WebsitPurchaseBean bean
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.MATERIAL_PURCHASE + bean.getPurchaseId());
-        try {
-            if (obtain.tryLock(5, TimeUnit.SECONDS)) {
-                websitPurchaseLogic.edit(bean);
-            }
-        } catch(Exception e) {
-            log.error("【采购入库处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/confirm")
-    @ApiOperation(value = "网点采购入库-审核")
-    public ResponseHelper confirm(
-            @ApiParam(value = "单号", required = true) @NotBlank(message = "单号不能为空") @RequestParam String purchaseId,
-            @ApiParam(value = "审核结果 OK=通过 FAIL=失败", required = true) @NotNull(message = "审核结果不能为空") @RequestParam MaterialFlagEnum flag,
-            @ApiParam(value = "仓储id") @RequestParam(required = false) String storageId
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.MATERIAL_PURCHASE + purchaseId);
-        try {
-            if (obtain.tryLock(5, TimeUnit.SECONDS)) {
-                websitPurchaseLogic.confirm(purchaseId, flag, storageId);
-            }
-        } catch(Exception e) {
-            log.error("【采购入库处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/import")
-    @ApiOperation(value = "采购入库-导入(下载模板:采购入库模板.xlsx)")
-    public ResponseHelper<String> importData(
-            @RequestPart("file") MultipartFile file,
-            @ApiParam(value = "类型 M=辅材 P=配件", required = true) @RequestParam String goodsType
-    ) throws Exception {
-        return ResponseHelper.success(websitPurchaseLogic.importData(file, goodsType));
-    }
-
-    @ZfireList
-    @PostMapping("/order/list")
-    @ApiOperation(value = "网点采购订单-列表")
-    public ResponseHelper<IPage<WebsitPurchaseOrderVO>> orderPage(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<WebsitPurchaseOrderVO> page = websitPurchaseLogic.orderPage(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<WebsitPurchaseOrderVO>() {});
-    }
-
-    @PostMapping("/order/list/export")
-    @ApiOperation("网点采购订单-导出")
-    public void orderListExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WebsitPurchaseOrderVO> baseVOIPage = websitPurchaseLogic.orderPage(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @PostMapping("/order/detail")
-    @ApiOperation(value = "网点采购订单-详情")
-    public ResponseHelper<WebsitMPurchaseBean> orderDetail(
-            @ApiParam(value = "purchaseId", required = true) @RequestParam String purchaseId
-    ) throws RemoteServiceException {
-        final WebsitMPurchaseBean bean = websitMPurchaseLogic.detail(purchaseId);
-        return ResponseHelper.success(bean);
-    }
-
-    @PostMapping("/order/update")
-    @ApiOperation(value = "网点采购订单-修改")
-    public ResponseHelper update(@RequestBody WebsitMPurchaseBean bean) throws RemoteServiceException {
-        websitMPurchaseLogic.orderUpdate(bean);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/order/revoke")
-    @ApiOperation(value = "网点采购订单-作废")
-    public ResponseHelper orderRevoke(@ApiParam(value = "采购申请单id",required = true) @RequestParam String purchaseId)
-            throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LOCK_MATERIAL_PURCHASE + purchaseId);
-        if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("系统繁忙，请稍后再尝试");
-        }
-        try {
-            websitMPurchaseLogic.orderRevoke(purchaseId);
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/order/confirm")
-    @ApiOperation(value = "网点采购订单-审核")
-    public ResponseHelper orderConfirm(@ApiParam(value = "采购申请单id",required = true) @RequestParam String purchaseId)
-            throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LOCK_MATERIAL_PURCHASE + purchaseId);
-        if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("系统繁忙，请稍后再尝试");
-        }
-        try {
-            websitMPurchaseLogic.orderConfirm(purchaseId);
-        } finally {
-            obtain.unlock();
-        }
-        return ResponseHelper.success();
-    }
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/material/manage/WebsitPurchaseRetController.java

@@ -1,136 +0,0 @@
-package com.gree.mall.manager.controller.material.manage;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.material.manage.WebsitPurchaseRetBean;
-import com.gree.mall.manager.bean.material.manage.WebsitPurchaseRetVO;
-import com.gree.mall.manager.constant.Constant;
-import com.gree.mall.manager.enums.material.MaterialFlagEnum;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.material.manage.WebsitPurchaseRetLogic;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.integration.redis.util.RedisLockRegistry;
-import org.springframework.validation.annotation.Validated;
-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.validation.Valid;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-
-@Slf4j
-@RestController
-@Api(value = "网点采购退货API", tags ={"网点采购退货API"} )
-@Validated
-@RequestMapping(value = "/websit/purchase/ret", produces = "application/json; charset=utf-8")
-public class WebsitPurchaseRetController {
-
-    @Resource
-    WebsitPurchaseRetLogic websitPurchaseRetLogic;
-    @Resource
-    RedisLockRegistry redisLockRegistry;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "网点采购退货-列表")
-    public ResponseHelper<IPage<WebsitPurchaseRetVO>> page(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<WebsitPurchaseRetVO> page = websitPurchaseRetLogic.page(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<WebsitPurchaseRetVO>() {});
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation("网点采购退货-导出")
-    public void listExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WebsitPurchaseRetVO> baseVOIPage = websitPurchaseRetLogic.page(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "网点采购退货-详情")
-    public ResponseHelper<WebsitPurchaseRetBean> detail(
-            @ApiParam(value = "purchaseRetId", required = true) @RequestParam String purchaseRetId
-    ) throws RemoteServiceException {
-        WebsitPurchaseRetBean bean = websitPurchaseRetLogic.detail(purchaseRetId);
-        return ResponseHelper.success(bean);
-    }
-
-    @PostMapping("/add")
-    @ApiOperation(value = "网点采购退货-添加")
-    public ResponseHelper add(
-            @Valid @RequestBody WebsitPurchaseRetBean bean
-    ) throws Exception {
-        websitPurchaseRetLogic.add(bean);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/edit")
-    @ApiOperation(value = "网点采购退货-编辑")
-    public ResponseHelper edit(
-            @Valid @RequestBody WebsitPurchaseRetBean bean
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.MATERIAL_PURCHASE + bean.getPurchaseRetId());
-        try {
-            if (obtain.tryLock(5, TimeUnit.SECONDS)) {
-                websitPurchaseRetLogic.edit(bean);
-            }
-        } catch(Exception e) {
-            log.error("【采购退货处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/confirm")
-    @ApiOperation(value = "网点采购退货-审核")
-    public ResponseHelper confirm(
-            @ApiParam(value = "单号", required = true) @NotBlank(message = "单号不能为空") @RequestParam String purchaseRetId,
-            @ApiParam(value = "审核结果 OK=通过 FAIL=失败", required = true) @NotNull(message = "审核结果不能为空") @RequestParam MaterialFlagEnum flag,
-            @ApiParam(value = "仓储id") @RequestParam(required = false) String storageId
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.MATERIAL_PURCHASE + purchaseRetId);
-        try {
-            if (obtain.tryLock(5, TimeUnit.SECONDS)) {
-                websitPurchaseRetLogic.confirm(purchaseRetId, flag, storageId);
-            }
-        } catch(Exception e) {
-            log.error("【采购退货处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/import")
-    @ApiOperation(value = "网点采购退货-导入(下载模板:采购退货模板.xlsx)")
-    public ResponseHelper<String> importData(
-            @RequestPart("file") MultipartFile file,
-            @ApiParam(value = "类型 M=辅材 P=配件", required = true) @RequestParam String goodsType
-    ) throws Exception {
-        return ResponseHelper.success(websitPurchaseRetLogic.importData(file, goodsType));
-    }
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/material/manage/WebsitRefundRecordController.java

@@ -1,57 +0,0 @@
-package com.gree.mall.manager.controller.material.manage;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.material.manage.WebsitPartsRefundRecordVO;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.material.manage.WebsitPartsRefundRecordLogic;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-@Slf4j
-@RestController
-@Api(value = "配件退款记录", tags = {"配件退款记录"})
-@RequestMapping(value = "/parts/refund-record", produces = "application/json; charset=utf-8")
-public class WebsitRefundRecordController {
-
-    @Resource
-    WebsitPartsRefundRecordLogic websitPartsRefundRecordLogic;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation("配件退款记录列表")
-    public ResponseHelper<IPage<WebsitPartsRefundRecordVO>> list(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) throws RemoteServiceException {
-        IPage<WebsitPartsRefundRecordVO> page = websitPartsRefundRecordLogic.pageList(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<WebsitPartsRefundRecordVO>() {
-        });
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation("配件退款记录导出")
-    public void listExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WebsitPartsRefundRecordVO> page = websitPartsRefundRecordLogic.pageList(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(page.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/material/manage/WebsitSalesController.java

@@ -1,302 +0,0 @@
-package com.gree.mall.manager.controller.material.manage;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.PayDetail;
-import com.gree.mall.manager.bean.admin.AdminUserCom;
-import com.gree.mall.manager.bean.material.manage.ImportResultBean;
-import com.gree.mall.manager.bean.material.manage.WebsitSalesBean;
-import com.gree.mall.manager.bean.material.manage.WebsitSalesVO;
-import com.gree.mall.manager.bean.material.stock.WebsitSalesCategoryVO;
-import com.gree.mall.manager.bean.material.stock.WebsitSalesGoodsVO;
-import com.gree.mall.manager.constant.Constant;
-import com.gree.mall.manager.enums.material.WebsitGoodsTypeEnum;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.common.CommonLogic;
-import com.gree.mall.manager.logic.material.manage.WebsitSalesLogic;
-import com.gree.mall.manager.zfire.bean.WebsitSalesParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.integration.redis.util.RedisLockRegistry;
-import org.springframework.validation.annotation.Validated;
-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.validation.Valid;
-import javax.validation.constraints.NotBlank;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-
-@Slf4j
-@RestController
-@Api(value = "网点销售管理API", tags = {"网点销售管理API"})
-@Validated
-@RequestMapping(value = "/websit/sales", produces = "application/json; charset=utf-8")
-public class WebsitSalesController {
-
-    @Resource
-    WebsitSalesLogic websitSalesLogic;
-    @Resource
-    RedisLockRegistry redisLockRegistry;
-    @Resource
-    CommonLogic commonLogic;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "网点销售订单-列表")
-    public ResponseHelper<IPage<WebsitSalesVO>> page(
-            @RequestBody WebsitSalesParamBean zfireParamBean
-    ) {
-        IPage<WebsitSalesVO> page = websitSalesLogic.page(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<WebsitSalesVO>() {
-        });
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation("网点销售订单-导出")
-    public void listExport(
-            @RequestBody WebsitSalesParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WebsitSalesVO> baseVOIPage = websitSalesLogic.page(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "网点销售订单-详情")
-    public ResponseHelper<List> detail(
-            @ApiParam(value = "salesId", required = true) @RequestParam String salesId
-    ) throws RemoteServiceException {
-        WebsitSalesBean bean = websitSalesLogic.detail(salesId);
-        return ResponseHelper.success(bean);
-    }
-
-    @PostMapping("/add")
-    @ApiOperation(value = "网点销售订单-添加")
-    public ResponseHelper add(
-            @Valid @RequestBody WebsitSalesBean bean
-    ) throws Exception {
-        websitSalesLogic.add(bean);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/edit")
-    @ApiOperation(value = "网点销售订单-编辑")
-    public ResponseHelper edit(
-            @Valid @RequestBody WebsitSalesBean bean
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.MATERIAL_SALES + bean.getSalesId());
-        try {
-            if (obtain.tryLock(5, TimeUnit.SECONDS)) {
-                websitSalesLogic.edit(bean);
-            }
-        } catch (Exception e) {
-            log.error("【销售订单处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/submit")
-    @ApiOperation(value = "网点销售订单-提交")
-    public ResponseHelper submit(
-            @ApiParam(value = "单号", required = true) @NotBlank(message = "单号不能为空") @RequestParam String salesId,
-            @ApiParam(value = "金额") @RequestParam(required = false) BigDecimal price,
-            @ApiParam(value = "凭证") @RequestParam(required = false) String urlPrc,
-            @ApiParam(value = "备注") @RequestParam(required = false) String remark
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.MATERIAL_SALES + salesId);
-        try {
-            if (obtain.tryLock(5, TimeUnit.SECONDS)) {
-                websitSalesLogic.submit(salesId, price, urlPrc, remark);
-            }
-        } catch (Exception e) {
-            log.error("【销售订单处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("change/cash")
-    @ApiOperation(value = "网点销售订单-改为现金支付")
-    public ResponseHelper changeCash(
-            @ApiParam(value = "单号", required = true) @NotBlank(message = "单号不能为空") @RequestParam String salesId
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.MATERIAL_SALES + salesId);
-        try {
-            if (obtain.tryLock(5, TimeUnit.SECONDS)) {
-                websitSalesLogic.changeCash(salesId);
-            }
-        } catch (Exception e) {
-            log.error("【销售订单处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/confirm")
-    @ApiOperation(value = "网点销售订单-审核")
-    public ResponseHelper confirm(
-            @ApiParam(value = "单号", required = true) @NotBlank(message = "单号不能为空") @RequestParam String salesId,
-            @ApiParam(value = "仓储id") @RequestParam(required = false) String storageId
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.MATERIAL_SALES + salesId);
-        try {
-            if (obtain.tryLock(5, TimeUnit.SECONDS)) {
-                websitSalesLogic.confirm(salesId, storageId);
-            }
-        } catch (Exception e) {
-            log.error("【销售订单处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/exist/stock/category")
-    @ApiOperation(value = "网点销售订单-辅材库存分类")
-    public ResponseHelper<List<WebsitSalesCategoryVO>> existStockCategory(
-            @ApiParam(value = "网点编号", required = true) @RequestParam String websitId,
-            @ApiParam(value = "仓库id", required = false) @RequestParam(required = false) String storageId
-    ) throws RemoteServiceException {
-        List<WebsitSalesCategoryVO> list = websitSalesLogic.existStockCategory(websitId, storageId);
-        return ResponseHelper.success(list);
-    }
-
-    @PostMapping("/exist/stock/goods")
-    @ApiOperation(value = "网点销售订单-辅材库存")
-    public ResponseHelper<List<WebsitSalesGoodsVO>> existStockGoods(
-            @ApiParam(value = "销售类型") @RequestParam(required = false, defaultValue = "RETAIL") String saleType,
-            @ApiParam(value = "网点编号", required = true) @RequestParam String websitId,
-            @ApiParam(value = "分类id", required = true) @RequestParam(required = false) String categoryId,
-            @ApiParam(value = "商品类型", required = true) @RequestParam WebsitGoodsTypeEnum type,
-            @ApiParam(value = "商品名称") @RequestParam(required = false) String goodsName,
-            @ApiParam(value = "工程基础资料id") @RequestParam(required = false) String orderEnginBaseId,
-            @ApiParam(value = "仓库id") @RequestParam(required = false) String storageId
-    ) throws RemoteServiceException {
-        List<WebsitSalesGoodsVO> list = websitSalesLogic.existStockGoods(saleType, websitId, categoryId, type, goodsName, orderEnginBaseId, storageId);
-        return ResponseHelper.success(list);
-    }
-
-    @PostMapping("/exist/stock/goodsList")
-    @ApiOperation(value = "网点销售订单-辅材库存列表")
-    public ResponseHelper<List<WebsitSalesGoodsVO>> existStockGoodsList(
-            @ApiParam(value = "网点编号", required = false) @RequestParam String websitId,
-            @ApiParam(value = "分类id", required = false) @RequestParam(required = false) String categoryId,
-            @ApiParam(value = "商品类型", required = false) @RequestParam WebsitGoodsTypeEnum type,
-            @ApiParam(value = "商品名称") @RequestParam(required = false) String goodsName,
-            @ApiParam(value = "规格") @RequestParam(required = false) String goodsSpecification,
-            @ApiParam(value = "配件类型") @RequestParam(required = false) String partType,
-            @ApiParam(value = "仓库id") @RequestParam(required = false) String storageId
-    ) throws RemoteServiceException {
-        List<WebsitSalesGoodsVO> list = websitSalesLogic.existStockGoodsList(websitId, categoryId, type, goodsName, goodsSpecification, partType, storageId);
-        return ResponseHelper.success(list);
-    }
-
-    @PostMapping("/generate/pay/code")
-    @ApiOperation(value = "网点销售订单-生成支付二维码")
-    public ResponseHelper<PayDetail> pay(
-            @ApiParam(value = "salesId单号", required = true) @RequestParam String salesId,
-            @ApiParam(value = "支付配置id", required = true) @RequestParam String payConfigId,
-            HttpServletRequest request
-    ) throws Exception {
-        PayDetail detail = websitSalesLogic.pay(salesId, payConfigId, request);
-        return ResponseHelper.success(detail);
-    }
-
-    @PostMapping("/m/import")
-    @ApiOperation(value = "网点销售订单-导入辅材(下载模板:辅材销售订单导入模板.xlsx)")
-    public ResponseHelper<String> importMaterialData(
-            @RequestPart("file") MultipartFile file
-    ) throws Exception {
-        AdminUserCom adminUser = commonLogic.getAdminUser();
-        String companyId = "";
-        String batchId = "";
-        if (Objects.nonNull(adminUser.getAdminCompanyWechat())) {
-            companyId = adminUser.getAdminCompanyWechat().getCompanyWechatId();
-        }
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.MATERIAL_SALES + companyId);
-        try {
-            if (obtain.tryLock(5, TimeUnit.SECONDS)) {
-                batchId = websitSalesLogic.importMaterialData(file);
-            }
-        } catch (Exception e) {
-            log.error("【导入辅材销售处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success(batchId);
-    }
-
-    @PostMapping("/p/import")
-    @ApiOperation(value = "网点销售订单-导入配件(下载模板:配件销售订单导入模板.xlsx)")
-    public ResponseHelper<String> importPartsData(
-            @RequestPart("file") MultipartFile file
-    ) throws Exception {
-        AdminUserCom adminUser = commonLogic.getAdminUser();
-        String companyId = "";
-        String batchId = "";
-        if (Objects.nonNull(adminUser.getAdminCompanyWechat())) {
-            companyId = adminUser.getAdminCompanyWechat().getCompanyWechatId();
-        }
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.MATERIAL_SALES + companyId);
-        try {
-            if (obtain.tryLock(5, TimeUnit.SECONDS)) {
-                batchId = websitSalesLogic.importPartsData(file);
-            }
-        } catch (Exception e) {
-            log.error("【导入配件销售处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success(batchId);
-    }
-
-    @PostMapping("/query/import/result")
-    @ApiOperation(value = "网点销售订单-查询导入处理结果")
-    public ResponseHelper<ImportResultBean> queryImportResult(
-            @ApiParam(value = "导入回传时的batchId", required = true) @RequestParam String importBatchId
-    ) throws RemoteServiceException {
-        ImportResultBean bean = websitSalesLogic.queryImportResult(importBatchId);
-        return ResponseHelper.success(bean);
-    }
-
-    @PostMapping("/test/refund")
-    @ApiOperation(value = "网点销售订单-测试退款")
-    public ResponseHelper<PayDetail> testRefund(
-            @ApiParam(value = "salesId单号", required = true) @RequestParam String salesId,
-            HttpServletRequest request
-    ) throws Exception {
-        websitSalesLogic.testRefund(salesId, request);
-        return ResponseHelper.success();
-    }
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/material/manage/WebsitTradeController.java

@@ -1,84 +0,0 @@
-package com.gree.mall.manager.controller.material.manage;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.PayDetail;
-import com.gree.mall.manager.bean.material.manage.WebsitTradeVO;
-import com.gree.mall.manager.constant.Constant;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.material.manage.WebsitTradeLogic;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.integration.redis.util.RedisLockRegistry;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-
-@Slf4j
-@RestController
-@Api(value = "交易管理API", tags ={"交易管理API"} )
-@Validated
-@RequestMapping(value = "/websit/trade", produces = "application/json; charset=utf-8")
-public class WebsitTradeController {
-
-    @Resource
-    WebsitTradeLogic websitTradeLogic;
-    @Resource
-    RedisLockRegistry redisLockRegistry;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "交易记录-列表")
-    public ResponseHelper<IPage<WebsitTradeVO>> page(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<WebsitTradeVO> page = websitTradeLogic.page(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<WebsitTradeVO>() {});
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation("交易记录-导出")
-    public void listExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WebsitTradeVO> baseVOIPage = websitTradeLogic.page(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @PostMapping("/trade/refund")
-    @ApiOperation(value = "交易记录-退款")
-    public ResponseHelper<PayDetail> tradeRefund(
-            @ApiParam(value = "销售记录id", required = true) @RequestParam String id,
-            @ApiParam(value = "退款金额", required = true) @RequestParam BigDecimal retAmount,
-            HttpServletRequest request
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.TRADE_RECORD_LOCK + id);
-        try {
-            if (obtain.tryLock(5, TimeUnit.SECONDS)) {
-                websitTradeLogic.tradeRefund(id, retAmount, request);
-            }
-        } catch(Exception e) {
-            log.error("【退款处理】失败", e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success();
-    }
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/material/manage/WebsitWorkSettlementController.java

@@ -1,78 +0,0 @@
-package com.gree.mall.manager.controller.material.manage;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.material.manage.WebsitWorkSettlementVO;
-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.material.manage.WebsitWorkSettlementLogic;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.integration.redis.util.RedisLockRegistry;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-import java.util.concurrent.locks.Lock;
-
-@Slf4j
-@RestController
-@Api(value = "网点工单结算记录", tags = {"网点工单结算记录"})
-@RequestMapping(value = "/parts/work-settlement", produces = "application/json; charset=utf-8")
-public class WebsitWorkSettlementController {
-
-    @Resource
-    WebsitWorkSettlementLogic websitWorkSettlementLogic;
-    @Resource
-    RedisLockRegistry redisLockRegistry;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation("网点工单结算记录列表")
-    public ResponseHelper<IPage<WebsitWorkSettlementVO>> list(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) throws RemoteServiceException {
-        IPage<WebsitWorkSettlementVO> partsBeanIPage = websitWorkSettlementLogic.pageList(zfireParamBean);
-        return ResponseHelper.success(partsBeanIPage, new TypeReference<WebsitWorkSettlementVO>() {
-        });
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation("网点工单结算记录列表导出")
-    public void listExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WebsitWorkSettlementVO> stockBeanIPage = websitWorkSettlementLogic.pageList(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(stockBeanIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @ApiOperation(value = "删除网点工单结算记录")
-    @PostMapping("/del")
-    public ResponseHelper del(
-            @ApiParam(required = true, value = "网点网点工单结算记录id") @RequestParam List<String> ids
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.NEW_REFUND + "import");
-        if (!obtain.tryLock()) {
-            throw new RemoteServiceException("正在处理导入结算状态数据，请稍后删除");
-        }
-        try {
-            websitWorkSettlementLogic.del(ids);
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success();
-    }
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/material/report/ReportController.java

@@ -1,180 +0,0 @@
-package com.gree.mall.manager.controller.material.report;
-
-import com.gree.mall.manager.bean.ExcelData;
-import com.gree.mall.manager.bean.material.report.*;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.material.report.ReportLogic;
-import com.gree.mall.manager.utils.DateUtils;
-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.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Date;
-import java.util.List;
-
-@Slf4j
-@RestController
-@Api(value = "网点物料报表", tags ={"网点物料报表"} )
-@RequestMapping(value = "/websit/report", produces = "application/json; charset=utf-8")
-public class ReportController {
-
-    @Resource
-    ReportLogic reportLogic;
-
-    @PostMapping("/worker/buy/sum")
-    @ApiOperation(value = "销售单按师傅手机号汇总")
-    public ResponseHelper<List<MaterialSalesSumBean>> workerBuySum(
-            @ApiParam(value = "门店编号") @RequestParam(required = false) String websitId,
-            @ApiParam(value = "开始时间") @RequestParam(required = false) String startTime,
-            @ApiParam(value = "结束时间") @RequestParam(required = false) String endTime,
-            @ApiParam(value = "月份") @RequestParam String month,
-            @ApiParam(value = "工程师手机号") @RequestParam(required = false) String workerMobile,
-            @ApiParam(value = "工程师编号") @RequestParam(required = false) String workerId,
-            @ApiParam(value = "工程师名称") @RequestParam(required = false) String workerName
-    ) throws RemoteServiceException {
-        List<MaterialSalesSumBean> materialSalesSumBeanList = reportLogic.workerBuySum(startTime, endTime, month, websitId, workerMobile,workerId, workerName);
-        return ResponseHelper.success(materialSalesSumBeanList);
-    }
-
-    @PostMapping("/worker/buy/sum/detail")
-    @ApiOperation(value = "根据手机号和时间获取销售单明细")
-    public ResponseHelper<List<MaterialSalesSumDetailBean>> workerBuySumDetail(
-            @ApiParam(value = "门店编号", required = true) @RequestParam String websitId,
-            @ApiParam(value = "开始时间") @RequestParam(required = false) String startTime,
-            @ApiParam(value = "结束时间") @RequestParam(required = false) String endTime,
-            @ApiParam(value = "月份") @RequestParam(required = false) String month,
-            @ApiParam(value = "工程师手机号", required = true) @RequestParam String workerMobile
-    ) throws RemoteServiceException {
-        List<MaterialSalesSumDetailBean> saleSumDetailBeanList = reportLogic.workerBuySumDetail(startTime, endTime, month, websitId, workerMobile);
-        return ResponseHelper.success(saleSumDetailBeanList);
-    }
-
-    @GetMapping("/export/worker/buy/sum")
-    @ApiOperation(value = "导出汇总按师傅手机号销售额")
-    public void exportSaleSum(
-            @ApiParam(value = "门店编号") @RequestParam(required = false) String websitId,
-            @ApiParam(value = "开始时间") @RequestParam(required = false) String startTime,
-            @ApiParam(value = "结束时间") @RequestParam(required = false) String endTime,
-            @ApiParam(value = "月份") @RequestParam(required = false) String month,
-            @ApiParam(value = "工程师手机号") @RequestParam(required = false) String workerMobile,
-            @ApiParam(value = "工程师编号") @RequestParam(required = false) String workerId,
-            @ApiParam(value = "工程师名称") @RequestParam(required = false) String workerName,
-            HttpServletRequest request, HttpServletResponse response
-    ) throws Exception {
-        List<MaterialSalesSumBean> materialSalesSumBeanList = reportLogic.workerBuySum(startTime, endTime, month, websitId, workerMobile, workerId, workerName);
-        ExcelData excelData = reportLogic.workerBuySumExport(materialSalesSumBeanList);
-        ExcelUtils.exportExcel(request,response,"汇总按师傅手机号销售额" + DateUtils.formatDate1(new Date()) + ".xlsx",excelData);
-    }
-
-    @GetMapping("/export/worker/buy/sum/Detail")
-    @ApiOperation(value = "导出汇总按师傅手机号销售明细")
-    public void exportSaleSumDetail(
-            @ApiParam(value = "门店编号") @RequestParam(required = false) String websitId,
-            @ApiParam(value = "开始时间") @RequestParam(required = false) String startTime,
-            @ApiParam(value = "结束时间") @RequestParam(required = false) String endTime,
-            @ApiParam(value = "月份") @RequestParam(required = false) String month,
-            @ApiParam(value = "工程师手机号") @RequestParam(required = false) String workerMobile,
-            @ApiParam(value = "工程师编号") @RequestParam(required = false) String workerId,
-            @ApiParam(value = "工程师名称") @RequestParam(required = false) String workerName,
-            HttpServletRequest request, HttpServletResponse response
-    ) throws Exception {
-        List<MaterialSalesSumDetailBean> saleSumDetailBeanList = reportLogic.workerBuySumDetail(startTime, endTime, month, websitId, workerMobile, workerId, workerName);
-        ExcelData excelData = reportLogic.workerBuySumDetailExport(saleSumDetailBeanList);
-        ExcelUtils.exportExcel(request,response,"汇总按师傅手机号销售明细" + DateUtils.formatDate1(new Date()) + ".xlsx",excelData);
-    }
-
-    @GetMapping("/export/sum/buy/detail")
-    @ApiOperation(value = "导出汇总销售明细")
-    public void exportSumSaleDetail(
-            @ApiParam(value = "门店编号") @RequestParam(required = false) String websitId,
-            @ApiParam(value = "开始时间") @RequestParam(required = false) String startTime,
-            @ApiParam(value = "结束时间") @RequestParam(required = false) String endTime,
-            @ApiParam(value = "月份") @RequestParam(required = false) String month,
-            @ApiParam(value = "工程师手机号") @RequestParam(required = false) String workerMobile,
-            @ApiParam(value = "工程师编号") @RequestParam(required = false) String workerId,
-            @ApiParam(value = "工程师名称") @RequestParam(required = false) String workerName,
-            HttpServletRequest request, HttpServletResponse response
-    ) throws Exception {
-        List<MaterialSalesSumDetailBean> saleSumDetailBeanList = reportLogic.sumBuyDetail(startTime, endTime, month, websitId, workerMobile, workerId, workerName);
-        ExcelData excelData = reportLogic.sumBuyDetailExport(saleSumDetailBeanList);
-        ExcelUtils.exportExcel(request,response,"汇总销售明细" + DateUtils.formatDate1(new Date()) + ".xlsx",excelData);
-    }
-
-    @PostMapping("/purchase-goods-sum")
-    @ApiOperation(value = "采购商品汇总")
-    public ResponseHelper<List<PurchaseDetailBean>> purchaseGoodsSum(
-            @ApiParam(value = "门店编号") @RequestParam(required = false) String websitId,
-            @ApiParam(value = "入库开始时间") @RequestParam(required = false) String startTime,
-            @ApiParam(value = "入库结束时间") @RequestParam(required = false) String endTime
-    ) {
-        List<PurchaseDetailBean> purchaseDetailBeanList = reportLogic.purchaseGoodsSum(startTime, endTime, websitId, false);
-        return ResponseHelper.success(purchaseDetailBeanList);
-    }
-
-    @GetMapping("/export/purchase-goods-sum")
-    @ApiOperation(value = "导出采购商品汇总")
-    public void exportPurchaseGoodsSum(
-            @ApiParam(value = "门店编号") @RequestParam(required = false) String websitId,
-            @ApiParam(value = "入库开始时间") @RequestParam(required = false) String startTime,
-            @ApiParam(value = "入库结束时间") @RequestParam(required = false) String endTime,
-            HttpServletRequest request, HttpServletResponse response
-    ) throws Exception {
-        List<PurchaseDetailBean> purchaseDetailBeanList = reportLogic.purchaseGoodsSum(startTime, endTime, websitId, false);
-        List<PurchaseDetailBean> purchaseDetailSumBeanList = reportLogic.purchaseGoodsSum(startTime, endTime, websitId, true);
-        ExcelData excelData = reportLogic.purchaseGoodsSumExport(purchaseDetailBeanList, purchaseDetailSumBeanList);
-        ExcelUtils.exportExcel(request,response,"采购商品汇总" + DateUtils.formatDate1(new Date()) + ".xlsx",excelData);
-    }
-
-    @PostMapping("/purchase-category-sum")
-    @ApiOperation(value = "月度网点采购类别")
-    public ResponseHelper<List<PurchaseCategoryBean>> purchaseCategorySum(
-            @ApiParam(value = "门店编号") @RequestParam(required = false) String websitId,
-            @ApiParam(value = "采购月度") @RequestParam String month
-    ) throws Exception {
-        List<PurchaseCategoryBean> purchaseCategoryBeanList = reportLogic.purchaseCategorySum(websitId, month);
-        return ResponseHelper.success(purchaseCategoryBeanList);
-    }
-
-    @GetMapping("/export/purchase-category-sum")
-    @ApiOperation(value = "导出月度网点采购类别")
-    public void exportSaleSumDetail(
-            @ApiParam(value = "门店编号") @RequestParam(required = false) String websitId,
-            @ApiParam(value = "采购月度") @RequestParam String month,
-            HttpServletRequest request, HttpServletResponse response
-    ) throws Exception {
-        List<PurchaseCategoryBean> purchaseCategoryBeanList = reportLogic.purchaseCategorySum(websitId, month);
-        ExcelData excelData = reportLogic.purchaseCategorySumExport(purchaseCategoryBeanList);
-        ExcelUtils.exportExcel(request,response,"月度网点采购类别" + DateUtils.formatDate1(new Date()) + ".xlsx", excelData);
-    }
-
-    @PostMapping("/worker-purchase-category-sum")
-    @ApiOperation(value = "月度师傅采购类别")
-    public ResponseHelper<List<WorkerPurchaseCategoryBean>> workerPurchaseCategorySum(
-            @ApiParam(value = "门店编号") @RequestParam(required = false) String websitId,
-            @ApiParam(value = "采购月度") @RequestParam String month
-    ) throws Exception {
-        List<WorkerPurchaseCategoryBean> workerPurchaseCategoryBeanList = reportLogic.workerPurchaseCategorySum(websitId, month);
-        return ResponseHelper.success(workerPurchaseCategoryBeanList);
-    }
-
-    @GetMapping("/export/worker-purchase-category-sum")
-    @ApiOperation(value = "导出月度师傅采购类别")
-    public void exportWorkerPurchaseCategorySum(
-            @ApiParam(value = "门店编号") @RequestParam(required = false) String shopId,
-            @ApiParam(value = "采购月度") @RequestParam String month,
-            HttpServletRequest request, HttpServletResponse response
-    ) throws Exception {
-        List<WorkerPurchaseCategoryBean> workerPurchaseCategoryBeanList = reportLogic.workerPurchaseCategorySum(shopId, month);
-        ExcelData excelData = reportLogic.workerPurchaseCategorySumExport(workerPurchaseCategoryBeanList);
-        ExcelUtils.exportExcel(request,response,"月度师傅采购类别" + DateUtils.formatDate1(new Date()) + ".xlsx", excelData);
-    }
-
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/material/stock/WebsitStockController.java

@@ -1,162 +0,0 @@
-package com.gree.mall.manager.controller.material.stock;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.listvo.material.WebsitStockAccPVO;
-import com.gree.mall.manager.bean.listvo.material.WebsitStockAccVO;
-import com.gree.mall.manager.bean.listvo.material.WebsitStockPVO;
-import com.gree.mall.manager.bean.listvo.material.WebsitStockVO;
-import com.gree.mall.manager.bean.material.base.MaterialCategoryVO;
-import com.gree.mall.manager.bean.material.base.WebsitGoodsMVO;
-import com.gree.mall.manager.enums.material.WebsitGoodsTypeEnum;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.material.stock.WebsitStockLogic;
-import com.gree.mall.manager.plus.entity.WebsitStockAcc;
-import com.gree.mall.manager.utils.excel.ExcelUtils;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.List;
-
-@Slf4j
-@RestController
-@Api(value = "库存管理-网点", tags ={"库存管理-网点"} )
-@Validated
-@RequestMapping(value = "/websit/stock", produces = "application/json; charset=utf-8")
-public class WebsitStockController {
-
-    @Autowired
-    WebsitStockLogic websitStockLogic;
-
-    @ZfireList
-    @PostMapping("list")
-    @ApiOperation(value = "辅材网点库存-列表")
-    public ResponseHelper<IPage<WebsitStockVO>> websitStockList(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<WebsitStockVO> page = websitStockLogic.websitStockList(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<WebsitStockVO>() {});
-    }
-
-    @ZfireList
-    @PostMapping("listP")
-    @ApiOperation(value = "配件网点库存-列表")
-    public ResponseHelper<IPage<WebsitStockPVO>> websitStockPList(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<WebsitStockPVO> page = websitStockLogic.websitStockPList(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<WebsitStockPVO>() {});
-    }
-
-
-
-    @PostMapping("list/export")
-    @ApiOperation("辅材网点库存-导出")
-    public void mListExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WebsitStockVO> page = websitStockLogic.websitStockList(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(page.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @PostMapping("listP/export")
-    @ApiOperation("配件网点库存-导出")
-    public void pListExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WebsitStockPVO> page = websitStockLogic.websitStockPList(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(page.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-
-    @PostMapping("importM")
-    @ApiOperation("辅材网点库存-导入(模板名称：辅材网点库存.xlsx)")
-    public ResponseHelper importData(MultipartFile file) throws IOException {
-        List<Object> objects = ExcelUtils.importExcel(file);
-        websitStockLogic.importData(objects, WebsitGoodsTypeEnum.M);
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("importP")
-    @ApiOperation("配件网点库存-导入(模板名称：配件网点库存.xlsx)")
-    public ResponseHelper importDataP(MultipartFile file) throws IOException {
-        List<Object> objects = ExcelUtils.importExcel(file);
-        websitStockLogic.importData(objects, WebsitGoodsTypeEnum.P);
-        return ResponseHelper.success();
-    }
-
-
-    @ZfireList
-    @PostMapping("acc/list")
-    @ApiOperation(value = "辅材库存明细-列表")
-    public ResponseHelper<IPage<WebsitStockAccVO>> websitStockAccList(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<WebsitStockAccVO> page = websitStockLogic.websitStockAccList(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<WebsitStockAccVO>() {});
-    }
-
-    @PostMapping("acc/list/export")
-    @ApiOperation("辅材网点库存-导出")
-    public void accListExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WebsitStockAccVO> page = websitStockLogic.websitStockAccList(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(page.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-
-
-    @ZfireList
-    @PostMapping("acc/listP")
-    @ApiOperation(value = "配件库存明细-列表")
-    public ResponseHelper<IPage<WebsitStockAccPVO>> websitStockAccPList(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<WebsitStockAccPVO> page = websitStockLogic.websitStockAccPList(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<WebsitStockAccVO>() {});
-    }
-
-    @PostMapping("acc/listP/export")
-    @ApiOperation("配件网点库存-导出")
-    public void accListPExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WebsitStockAccPVO> page = websitStockLogic.websitStockAccPList(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(page.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/material/stock/WorkerStockController.java

@@ -1,166 +0,0 @@
-package com.gree.mall.manager.controller.material.stock;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.listvo.material.WorkerStockAccPVO;
-import com.gree.mall.manager.bean.listvo.material.WorkerStockAccVO;
-import com.gree.mall.manager.bean.listvo.material.WorkerStockPVO;
-import com.gree.mall.manager.bean.listvo.material.WorkerStockVO;
-import com.gree.mall.manager.enums.material.WebsitGoodsTypeEnum;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.material.stock.WorkerStockLogic;
-import com.gree.mall.manager.utils.excel.ExcelUtils;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-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.integration.redis.util.RedisLockRegistry;
-import org.springframework.validation.annotation.Validated;
-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 java.util.List;
-
-@Slf4j
-@RestController
-@Api(value = "库存管理-师傅", tags ={"库存管理-师傅"} )
-@Validated
-@RequestMapping(value = "/worker/stock", produces = "application/json; charset=utf-8")
-public class WorkerStockController {
-
-    @Autowired
-    WorkerStockLogic workerStockLogic;
-    @Resource
-    RedisLockRegistry redisLockRegistry;
-
-    @ZfireList
-    @PostMapping("list")
-    @ApiOperation(value = "辅材师傅库存-列表")
-    public ResponseHelper<IPage<WorkerStockVO>> workerStockList(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<WorkerStockVO> page = workerStockLogic.workerStockList(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<WorkerStockVO>() {});
-    }
-
-    @ZfireList
-    @PostMapping("listP")
-    @ApiOperation(value = "配件师傅库存-列表")
-    public ResponseHelper<IPage<WorkerStockPVO>> websitStockPList(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<WorkerStockPVO> page = workerStockLogic.workerStockPList(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<WorkerStockPVO>() {});
-    }
-
-    @PostMapping("list/export")
-    @ApiOperation("辅材师傅库存-导出")
-    public void mListExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WorkerStockVO> page = workerStockLogic.workerStockList(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(page.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @PostMapping("/del")
-    @ApiOperation(value = "辅材师傅库存-删除")
-    public ResponseHelper delStock(
-            @ApiParam(value = "id", required = true) @RequestBody List<String> ids
-    ) throws Exception {
-        workerStockLogic.delStock(ids);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("listP/export")
-    @ApiOperation("配件师傅库存-导出")
-    public void pListExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WorkerStockPVO> page = workerStockLogic.workerStockPList(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(page.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-
-
-    @PostMapping("importM")
-    @ApiOperation("辅材师傅库存-导入(模板名称：辅材师傅库存.xlsx)")
-    public ResponseHelper importData(MultipartFile file) throws Exception {
-        List<Object> objects = ExcelUtils.importExcel(file);
-        workerStockLogic.importData(objects, WebsitGoodsTypeEnum.M);
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("importP")
-    @ApiOperation("配件师傅库存-导入(模板名称：配件师傅库存.xlsx)")
-    public ResponseHelper importDataP(MultipartFile file) throws Exception {
-        List<Object> objects = ExcelUtils.importExcel(file);
-        workerStockLogic.importData(objects, WebsitGoodsTypeEnum.P);
-        return ResponseHelper.success();
-    }
-
-
-    @ZfireList
-    @PostMapping("acc/list")
-    @ApiOperation(value = "辅材库存明细-列表")
-    public ResponseHelper<IPage<WorkerStockAccVO>> websitStockAccList(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<WorkerStockAccVO> page = workerStockLogic.workerStockAccList(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<WorkerStockAccVO>() {});
-    }
-
-    @PostMapping("acc/list/export")
-    @ApiOperation("辅材师傅库存-导出")
-    public void accListExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WorkerStockAccVO> page = workerStockLogic.workerStockAccList(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(page.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-
-
-    @ZfireList
-    @PostMapping("acc/listP")
-    @ApiOperation(value = "配件库存明细-列表")
-    public ResponseHelper<IPage<WorkerStockAccPVO>> workerStockAccPList(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<WorkerStockAccPVO> page = workerStockLogic.workerStockAccPList(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<WorkerStockAccPVO>() {});
-    }
-
-    @PostMapping("acc/listP/export")
-    @ApiOperation("配件网点库存-导出")
-    public void accListPExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WorkerStockAccPVO> page = workerStockLogic.workerStockAccPList(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(page.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/material/vender/VenderCheckPurchaseController.java

@@ -1,111 +0,0 @@
-package com.gree.mall.manager.controller.material.vender;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.material.manage.WebsitMPurchaseBean;
-import com.gree.mall.manager.bean.material.vender.WebsitPurchaseCheckVO;
-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.material.manage.WebsitMPurchaseLogic;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.integration.redis.util.RedisLockRegistry;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-
-@Slf4j
-@RestController
-@Api(value = "供应商核实采购API", tags ={"供应商核实采购API"} )
-@RequestMapping(value = "/vender/check/purchase", produces = "application/json; charset=utf-8")
-public class VenderCheckPurchaseController {
-
-    @Resource
-    WebsitMPurchaseLogic websitMPurchaseLogic;
-    @Resource
-    RedisLockRegistry redisLockRegistry;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "核实采购-列表")
-    public ResponseHelper<IPage<WebsitPurchaseCheckVO>> page(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<WebsitPurchaseCheckVO> page = websitMPurchaseLogic.checkPage(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<WebsitPurchaseCheckVO>() {});
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation("核实采购-导出")
-    public void listExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WebsitPurchaseCheckVO> baseVOIPage = websitMPurchaseLogic.checkPage(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "核实采购-详情")
-    public ResponseHelper<WebsitMPurchaseBean> detail(
-            @ApiParam(value = "purchaseId", required = true) @RequestParam String purchaseId
-    ) throws RemoteServiceException {
-        WebsitMPurchaseBean bean = websitMPurchaseLogic.detail(purchaseId);
-        return ResponseHelper.success(bean);
-    }
-
-    @PostMapping("/update")
-    @ApiOperation(value = "核实采购-修改")
-    public ResponseHelper update(@RequestBody WebsitMPurchaseBean bean) throws RemoteServiceException {
-        websitMPurchaseLogic.checkUpdate(bean);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/revoke")
-    @ApiOperation(value = "核实采购-撤消")
-    public ResponseHelper revoke(@ApiParam(value = "采购申请单id",required = true) @RequestParam String purchaseId)
-            throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LOCK_MATERIAL_PURCHASE + purchaseId);
-        if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("系统繁忙，请稍后再尝试");
-        }
-        try {
-            websitMPurchaseLogic.revoke(purchaseId, 2);
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/verify")
-    @ApiOperation(value = "核实采购-核实")
-    public ResponseHelper verify(@ApiParam(value = "采购申请单id",required = true) @RequestParam String purchaseId)
-            throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LOCK_MATERIAL_PURCHASE + purchaseId);
-        if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("系统繁忙，请稍后再尝试");
-        }
-        try {
-            websitMPurchaseLogic.verify(purchaseId);
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success();
-    }
-
-}

mall-server-sync-api/src/main/java/com/gree/mall/manager/controller/material/vender/VenderController.java

@@ -1,80 +0,0 @@
-package com.gree.mall.manager.controller.material.vender;
-
-import cn.hutool.core.lang.TypeReference;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.manager.annotation.ZfireList;
-import com.gree.mall.manager.bean.material.vender.WebsitVenderVO;
-import com.gree.mall.manager.exception.RemoteServiceException;
-import com.gree.mall.manager.helper.ResponseHelper;
-import com.gree.mall.manager.logic.material.vender.VenderLogic;
-import com.gree.mall.manager.plus.entity.WebsitVender;
-import com.gree.mall.manager.zfire.bean.ZfireParamBean;
-import com.gree.mall.manager.zfire.util.FieldUtils;
-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 javax.servlet.http.HttpServletResponse;
-
-@Slf4j
-@RestController
-@Api(value = "供应商管理API", tags ={"供应商管理API"} )
-@RequestMapping(value = "/vender", produces = "application/json; charset=utf-8")
-public class VenderController {
-
-    @Resource
-    VenderLogic venderLogic;
-
-    @ZfireList
-    @PostMapping("/list")
-    @ApiOperation(value = "供应商管理-列表")
-    public ResponseHelper<IPage<WebsitVenderVO>> page(
-            @RequestBody ZfireParamBean zfireParamBean
-    ) {
-        IPage<WebsitVenderVO> page = venderLogic.page(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<WebsitVenderVO>() {});
-    }
-
-    @PostMapping("/list/export")
-    @ApiOperation("供应商管理-导出")
-    public void listExport(
-            @RequestBody ZfireParamBean zfireParamBean,
-            HttpServletRequest request,
-            HttpServletResponse response
-    ) throws Exception {
-        //2.查询要导出的内容
-        IPage<WebsitVenderVO> baseVOIPage = venderLogic.page(zfireParamBean);
-        //3.导出
-        FieldUtils.exportData(baseVOIPage.getRecords(), zfireParamBean.getExportFields(), request, response);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "供应商管理-详情")
-    public ResponseHelper<WebsitVender> detail(
-            @ApiParam(value = "id", required = true) @RequestParam String id
-    ) throws RemoteServiceException {
-        return ResponseHelper.success(venderLogic.detail(id));
-    }
-
-    @PostMapping("/add")
-    @ApiOperation(value = "供应商管理-添加")
-    public ResponseHelper add(
-            @RequestBody WebsitVender bean
-    ) throws Exception {
-        venderLogic.add(bean);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/edit")
-    @ApiOperation(value = "供应商管理-编辑")
-    public ResponseHelper edit(
-            @RequestBody WebsitVender bean
-    ) throws Exception {
-        venderLogic.edit(bean);
-        return ResponseHelper.success();
-    }
-}