Merge remote-tracking branch 'origin/master'

src/main/java/com/gree/mall/manager/bean/goods/GoodsApplyVO.java

@@ -1,18 +1,23 @@
 package com.gree.mall.manager.bean.goods;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.gree.mall.manager.annotation.ZfireField;
+import com.gree.mall.manager.enums.ExamineStatusEnum;
 import com.gree.mall.manager.enums.GoodsStatusEnum;
+import com.gree.mall.manager.plus.entity.GoodsApply;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 @Data
 @ApiModel
-public class GoodsApplyVO {
+public class GoodsApplyVO   {
 
     @ZfireField(hide = true,tbName = "a")
     @TableId(value = "goods_apply_id", type = IdType.ID_WORKER_STR)
@@ -49,10 +54,27 @@ public class GoodsApplyVO {
     @ZfireField(tbName = "a")
     @ApiModelProperty(value = "商品价格")
     private BigDecimal goodsPrice;
+    @ZfireField(tbName = "a")
+    @ApiModelProperty(value = "状态")
+    private ExamineStatusEnum status;
+    @ZfireField(tbName = "a")
+    @ApiModelProperty(value = "申请备注")
+    private String remark;
+    @ZfireField(tbName = "a")
+    @ApiModelProperty(value = "审核人")
+    private String approveName;
+    @ZfireField(tbName = "a")
+    @ApiModelProperty(value = "审核时间")
+    private Date approveTime;
+    @ZfireField(tbName = "a")
+    @ApiModelProperty(value = "审核备注")
+    private String approveRemark;
+    @ZfireField(tbName = "a")
+    @ApiModelProperty(value = "提交时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
 
-    @ZfireField(tbName = "b")
-    @ApiModelProperty(value = "商品状态")
-    private GoodsStatusEnum status;
     @ZfireField(tbName = "b")
     @ApiModelProperty(value = "排序")
     private Integer sortNum;

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

@@ -1,6 +1,7 @@
 package com.gree.mall.manager.commonmapper;
 
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import com.baomidou.mybatisplus.annotation.SqlParser;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gree.mall.manager.bean.count.CountBean;
 import com.gree.mall.manager.bean.count.CountOrderBean;
@@ -37,6 +38,7 @@ public interface CountMapper {
      * 商品销量排行
      */
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
+    @SqlParser
     public List<GoodsRankBean> countGoodsRank(@Param("startTime") String startTime,
                                               @Param("endTime") String endTime,
                                               @Param("companyWechatIds") List<String> companyWechatIds,

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

@@ -111,9 +111,10 @@ public class AdminWebsitController {
     @ApiOperation("导入商家附件(商家导入.xlsx)")
     public ResponseHelper importData(
             @RequestPart("file") MultipartFile file
+            , HttpServletRequest request
     ) throws IOException {
         List<Object> objects = ExcelUtils.importExcel(file);
-        adminWebsitLogic.importData(objects);
+        adminWebsitLogic.importData(objects,request);
         return ResponseHelper.success();
     }
 

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

@@ -86,4 +86,15 @@ public class GoodsApplyController {
         return ResponseHelper.success();
     }
 
+
+    @PostMapping("/approve")
+    @ApiOperation(value = "审批")
+    public ResponseHelper<GoodsApplyDetail> approve(
+            @ApiParam(value = "申请id") @RequestParam(required = false) String goodsApplyId,
+            @ApiParam(value = "WAIT 待审核 OK 通过  FAIL 驳回") @RequestParam(required = false) String status,
+            HttpServletRequest request
+    ) throws RemoteServiceException {
+        goodsApplyLogic.approve(goodsApplyId,status);
+        return ResponseHelper.success();
+    }
 }

src/main/java/com/gree/mall/manager/enums/ExamineStatusEnum.java

@@ -0,0 +1,29 @@
+package com.gree.mall.manager.enums;
+
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.gree.mall.manager.enums.base.BaseEnum;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
+public enum ExamineStatusEnum implements BaseEnum {
+    WAIT("WAIT","待审核"),
+    FAIL("FAIL","驳回"),
+    OK("OK","通过");
+
+    @EnumValue
+    @JsonValue
+    private final String key;
+
+    private final String remark;
+
+    @JsonCreator(mode = JsonCreator.Mode.DELEGATING)
+    public static ExamineStatusEnum create(String key) {
+        return BaseEnum.keyToEnum(ExamineStatusEnum.class, key);
+    }
+}

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

@@ -3,20 +3,19 @@ package com.gree.mall.manager.logic.admin;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gree.mall.manager.bean.admin.AdminUserBean;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.admin.AdminWebsitTree;
 import com.gree.mall.manager.bean.admin.AdminWebsitVO;
+import com.gree.mall.manager.bean.admin.reqDto.AdminUserAddReqBean;
+import com.gree.mall.manager.bean.admin.reqDto.AdminUserPermissions;
 import com.gree.mall.manager.commonmapper.AdminMapper;
+import com.gree.mall.manager.enums.IsYesNoEnum;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
-import com.gree.mall.manager.plus.entity.AdminCompanyWechat;
-import com.gree.mall.manager.plus.entity.AdminCompanyWechatPayConfig;
-import com.gree.mall.manager.plus.entity.AdminWebsit;
-import com.gree.mall.manager.plus.entity.AdminZone;
-import com.gree.mall.manager.plus.service.AdminCompanyWechatPayConfigService;
-import com.gree.mall.manager.plus.service.AdminCompanyWechatService;
-import com.gree.mall.manager.plus.service.AdminWebsitService;
-import com.gree.mall.manager.plus.service.AdminZoneService;
+import com.gree.mall.manager.logic.common.LbsAmapLogic;
+import com.gree.mall.manager.plus.entity.*;
+import com.gree.mall.manager.plus.service.*;
 import com.gree.mall.manager.utils.StringUtil;
 import com.gree.mall.manager.zfire.bean.ZfireParamBean;
 import com.gree.mall.manager.zfire.util.FieldUtils;
@@ -24,6 +23,7 @@ import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -52,6 +52,15 @@ public class AdminWebsitLogic {
     @Autowired
     AdminCompanyWechatPayConfigService adminCompanyWechatPayConfigService;
 
+    @Autowired
+    SysDictCompanyService sysDictCompanyService;
+
+    @Autowired
+    AdminUserLogic adminUserLogic;
+
+    @Autowired
+    LbsAmapLogic lbsAmapLogic;
+
     /**
      * 区域列表
      */
@@ -99,23 +108,42 @@ public class AdminWebsitLogic {
         if(count > 0){
             throw new RemoteServiceException("部门名称或部门编号已存在");
         }
-        if(adminWebsit.getParentId() == 0){
-            throw new RemoteServiceException("请选择父部门");
-        }
+
         if (StringUtil.isEmpty(adminWebsit.getCompanyWechatId()))
             throw new RemoteServiceException("上级商家不能为空");
         AdminCompanyWechat adminCompanyWechat = adminCompanyWechatService.getById(adminWebsit.getPayWorkerCodeId());
         AdminCompanyWechat adminCompanyWechatP = adminCompanyWechatService.getById(adminWebsit.getCompanyWechatId());
 
-        //Long aLong = workWechatLogic.addOrganization(adminWebsit.getName(), adminWebsit.getParentId(),adminUser.getAdminCompanyWechat());
-        String aLong = IdWorker.getIdStr();
-        adminWebsit.setWebsitId(aLong+"");
-//        adminWebsit.setCorpId(adminUser.getCorpIds().get(0));
-        adminWebsit.setWebsitId(aLong);
+
+        adminWebsit.setWebsitId(adminWebsit.getWebsitNumber());
         adminWebsit.setCompanyName(adminCompanyWechatP.getCompanyName());
         adminWebsit.setPayWorkerCodeName(adminCompanyWechat.getCompanyName());
         adminWebsit.insert();
 
+        AdminUserAddReqBean adminUserBean = new AdminUserAddReqBean();
+        adminUserBean.setUserName(adminWebsit.getWebsitId());
+        adminUserBean.setNickName(adminWebsit.getName());
+        adminUserBean.setLinkPhone(adminWebsit.getPersonMobile());
+        adminUserBean.setLinkName(adminWebsit.getPerson());
+        adminUserBean.setPassword("123456");
+        adminUserBean.setRoleId("1899638664615489538");
+        adminUserBean.setRoleName("网点");
+        adminUserBean.setWebsitId(adminWebsit.getWebsitId());
+        adminUserBean.setWebsitName(adminWebsit.getName());
+        adminUserBean.setCompanyWechatId(adminWebsit.getCompanyWechatId());
+        adminUserBean.setCompanyName(adminWebsit.getCompanyName());
+        adminUserBean.setAddress(adminWebsit.getAddress());
+        adminUserBean.setType(2);
+
+        List<AdminUserPermissions> adminUserPermissions = new ArrayList<>();
+        AdminUserPermissions adminUserPermissions1 = new AdminUserPermissions();
+        adminUserPermissions1.setAdminUserPermissionsId(adminWebsit.getWebsitId());
+        adminUserPermissions1.setIsDept(false);
+        adminUserPermissions.add(adminUserPermissions1);
+
+        adminUserBean.setPermissions(adminUserPermissions);
+        adminUserLogic.save(adminUserBean, request);
+
     }
     /**
      * 编辑部门
@@ -135,10 +163,6 @@ public class AdminWebsitLogic {
         if(count > 0){
             throw new RemoteServiceException("部门名称或部门编号已存在");
         }
-        if(adminWebsit.getParentId() == 0){
-            throw new RemoteServiceException("请选择父部门");
-
-        }
 
         if (StringUtil.isEmpty(adminWebsit.getCompanyWechatId()))
             throw new RemoteServiceException("上级商家不能为空");
@@ -242,7 +266,8 @@ public class AdminWebsitLogic {
         return adminDeptWebsitVOIPage;
     }
 
-    public void importData(List<Object> objects) {
+    @Transactional(rollbackFor = Exception.class)
+    public void importData(List<Object> objects,HttpServletRequest request) {
 
         List<AdminWebsit> adminWebsits = new ArrayList<>();
 
@@ -252,32 +277,58 @@ public class AdminWebsitLogic {
 
             AdminWebsit adminWebsit = new AdminWebsit();
 
-            adminWebsit.setWebsitId((String) row.get(0));
-            adminWebsit.setWebsitNumber((String) row.get(0));
-            adminWebsit.setName((String) row.get(1));
-            adminWebsit.setMobile((String) row.get(2));
-            adminWebsit.setPerson((String) row.get(3));
-            adminWebsit.setPersonMobile((String) row.get(4));
-            adminWebsit.setType((String) row.get(5));
-            adminWebsit.setAddress((String) row.get(6));
-            AdminCompanyWechatPayConfig one = adminCompanyWechatPayConfigService.lambdaQuery()
-                    .eq(AdminCompanyWechatPayConfig::getCompanyName, (String) row.get(7))
+            AdminCompanyWechat oneP = adminCompanyWechatService.lambdaQuery()
+                    .eq(AdminCompanyWechat::getCompanyName, (String) row.get(0))
+                    .last("limit 1").one();
+
+
+            if (oneP == null)
+                throw new RemoteServiceException("第"+rowIndex+"行，找不到上级商户");
 
+            adminWebsit.setCompanyName(oneP.getCompanyName());
+            adminWebsit.setCompanyWechatId(oneP.getCompanyWechatId());
+            adminWebsit.setWebsitId((String) row.get(1));
+            adminWebsit.setWebsitNumber((String) row.get(1));
+            adminWebsit.setName((String) row.get(2));
+            adminWebsit.setMobile((String) row.get(3));
+            adminWebsit.setPerson((String) row.get(4));
+            adminWebsit.setPersonMobile((String) row.get(5));
+
+            SysDictCompany sysDictCompany = sysDictCompanyService.lambdaQuery()
+                    .eq(SysDictCompany::getDictType, "WEBSIT_TYPE")
+                    .eq(SysDictCompany::getDictValue, (String) row.get(6)).one();
+
+            if (sysDictCompany == null)
+                throw new RemoteServiceException("第"+rowIndex+"行，找不到店铺类型");
+
+            adminWebsit.setType((String) row.get(6));
+            adminWebsit.setTypeId(sysDictCompany.getDictCode());
+            adminWebsit.setAddress((String) row.get(7));
+            AdminCompanyWechat one = adminCompanyWechatService.lambdaQuery()
+                    .eq(AdminCompanyWechat::getCompanyName, (String) row.get(8))
                     .last("limit 1").one();
 
             if (one == null)
                 throw new RemoteServiceException("第"+rowIndex+"行，找不到支付商户");
-            adminWebsit.setPayWorkerCodeName((String) row.get(7));
-            adminWebsit.setPayWorkerCodeId(one.getId());
-            if (row.size() > 7) {
-                adminWebsit.setYunAppid((String) row.get(8));
-                adminWebsit.setYunAppkey((String) row.get(9));
-                adminWebsit.setYunCompany((String) row.get(10));
-                adminWebsit.setYunNumber((String) row.get(11));
-                adminWebsit.setYunSystem((String) row.get(12));
-                adminWebsit.setYunTax((String) row.get(13));
-                adminWebsit.setYunName((String) row.get(14));
-                adminWebsit.setYunTwo((((String) row.get(15)).equals("是"))?"YES":"NO");
+            adminWebsit.setPayWorkerCodeName(one.getCompanyName());
+            adminWebsit.setPayWorkerCodeId(one.getCompanyWechatId());
+
+            String lnglat = lbsAmapLogic.getLocationByAddress(adminWebsit.getAddress());
+
+            adminWebsit.setLng(lnglat.split(",")[0]);
+            adminWebsit.setLat(lnglat.split(",")[1]);
+            if (row.size() > 8) {
+                if (!StringUtil.isEmpty((String) row.get(9))) {
+                    adminWebsit.setIsOpen(IsYesNoEnum.YES.getKey());
+                    adminWebsit.setYunAppid((String) row.get(9));
+                    adminWebsit.setYunAppkey((String) row.get(10));
+                    adminWebsit.setYunCompany((String) row.get(11));
+                    adminWebsit.setYunNumber((String) row.get(12));
+                    adminWebsit.setYunSystem((String) row.get(13));
+                    adminWebsit.setYunTax((String) row.get(14));
+                    adminWebsit.setYunName((String) row.get(15));
+                    adminWebsit.setYunTwo((((String)row.get(16)).equals("是")) ? "YES" : "NO");
+                }
             }
 
             adminWebsits.add(adminWebsit);
@@ -285,5 +336,32 @@ public class AdminWebsitLogic {
         }
 
         adminWebsitService.saveBatch(adminWebsits);
+
+        for (AdminWebsit adminWebsit : adminWebsits) {
+
+            AdminUserAddReqBean adminUserBean = new AdminUserAddReqBean();
+            adminUserBean.setUserName(adminWebsit.getWebsitId());
+            adminUserBean.setNickName(adminWebsit.getName());
+            adminUserBean.setLinkPhone(adminWebsit.getPersonMobile());
+            adminUserBean.setLinkName(adminWebsit.getPerson());
+            adminUserBean.setPassword("123456");
+            adminUserBean.setRoleId("1899638664615489538");
+            adminUserBean.setRoleName("网点");
+            adminUserBean.setWebsitId(adminWebsit.getWebsitId());
+            adminUserBean.setWebsitName(adminWebsit.getName());
+            adminUserBean.setCompanyWechatId(adminWebsit.getCompanyWechatId());
+            adminUserBean.setCompanyName(adminWebsit.getCompanyName());
+            adminUserBean.setAddress(adminWebsit.getAddress());
+            adminUserBean.setType(2);
+
+            List<AdminUserPermissions> adminUserPermissions = new ArrayList<>();
+            AdminUserPermissions adminUserPermissions1 = new AdminUserPermissions();
+            adminUserPermissions1.setAdminUserPermissionsId(adminWebsit.getWebsitId());
+            adminUserPermissions1.setIsDept(false);
+            adminUserPermissions.add(adminUserPermissions1);
+
+            adminUserBean.setPermissions(adminUserPermissions);
+            adminUserLogic.save(adminUserBean, request);
+        }
     }
 }

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

@@ -0,0 +1,49 @@
+package com.gree.mall.manager.logic.common;
+
+import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class LbsAmapLogic {
+
+//    private static final String lbsWebKey = "b772f8b0ace6bc96c04ae8e48f241e36";
+    private static final String lbsWebKey = "428a7111e02ea8367a3b34804eaa025b";
+
+
+    /**
+     * 根据地址反查经纬度
+     * @Param 中文地址(最好详细)
+     * @return lng,lat
+     */
+    public String getLocationByAddress(String address){
+        //String lbsWebKey = "b772f8b0ace6bc96c04ae8e48f241e36";
+        //String address = "广东省广州市天河区华景新城";
+        String url = "https://restapi.amap.com/v3/geocode/geo?key="+lbsWebKey+"&address="+address;
+        String s = HttpUtil.get(url);
+        JSONObject jsonObject = new JSONObject(s);
+        String status = jsonObject.getStr("status");
+        if(!status.equals("1")){
+            return null;
+        }
+        JSONArray geocodes = jsonObject.getJSONArray("geocodes");
+        if(CollectionUtils.isEmpty(geocodes))
+            return null;
+        Map<String, Object> map = (Map<String, Object>) geocodes.get(0);
+        String location = (String)map.get("location");
+        log.info("根据地址【{}】反查经纬度【{}】",address,new JSONObject(map));
+        return location;
+    }
+
+
+
+}

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

@@ -142,20 +142,22 @@ public class CouponLogic {
     public void add(HttpServletRequest request,CouponBean couponBean) throws RemoteServiceException {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
 
-        if (couponBean.getActiveType() == 1) {
+ /*       if (couponBean.getActiveType() == 1) {
             if (Objects.isNull(couponBean.getActiveStartTime()) || Objects.isNull(couponBean.getActiveEndTime())) {
                 throw new RemoteServiceException("使用时间区间不能为空！");
             }
             if (couponBean.getActiveEndTime().compareTo(couponBean.getActiveStartTime()) < 0) {
                 throw new RemoteServiceException("使用结束时间不能少于开始时间！");
             }
-        }
+        }*/
         couponBean.setFlag(CouponFlagEnum.WAIT.toString());
         couponBean.setLeftAmount(couponBean.getCouponAmount());
         couponBean.setCreateTime(new Date());
         couponBean.setCompanyWechatId(adminUser.getLoginCompanyWechatId());
         couponBean.setCompanyName(adminUser.getLoginCompanyName());
-        couponBean.setActiveType(couponBean.getActiveDay() != null ? 2:1);
+        couponBean.setActiveType(2);
+        couponBean.setCompanyName(adminUser.getCompanyName());
+        couponBean.setCompanyWechatId(adminUser.getCompanyWechatId());
         couponService.save(couponBean);
         String couponId = couponBean.getCouponId();
         if (couponBean.getCouponType().trim().equals(CouponTypeEnum.GOODS.getRemark()) && couponBean.getGoodsList() != null) {

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

@@ -3,10 +3,13 @@ package com.gree.mall.manager.logic.goods;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.manager.bean.admin.AdminUserCom;
 import com.gree.mall.manager.bean.goods.*;
 import com.gree.mall.manager.commonmapper.CustomGoodsApplyMapper;
+import com.gree.mall.manager.enums.ExamineStatusEnum;
+import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.logic.common.CommonLogic;
 import com.gree.mall.manager.plus.entity.Goods;
 import com.gree.mall.manager.plus.entity.GoodsApply;
@@ -100,14 +103,20 @@ public class GoodsApplyLogic {
 
     @Transactional(rollbackFor = Exception.class)
     public void add(GoodsApplyAddUp goodsApplyAddUp, HttpServletRequest request) {
+        goodsApplyAddUp.setGoodsApplyId(IdWorker.getIdStr());
+
+        if (goodsApplyService.lambdaQuery().eq(GoodsApply::getWebsitId,goodsApplyAddUp.getWebsitId())
+        .eq(GoodsApply::getGoodsId,goodsApplyAddUp.getGoodsId()).count() > 0)
+            throw new RemoteServiceException("商品存在价格调整，请去申请调整修改");
 
-        goodsApplyAddUp.insert();
 
         List<GoodsSpec> goodsSpecs = goodsSpecService.lambdaQuery().eq(GoodsSpec::getGoodsId, goodsApplyAddUp.getGoodsId())
                 .list();
 
         List<GoodsApplyItem> goodsApplyItemList = new ArrayList<>();
 
+        Boolean ifStatus = true;
+
         for (GoodsSpec goodsSpec : goodsSpecs) {
             List<GoodsApplyItem> goodsApplyItems = goodsApplyAddUp.getGoodsApplyItems().stream()
                     .filter(item -> item.getGoodsSpecId().equals(goodsSpec.getGoodsSpecId()))
@@ -117,6 +126,11 @@ public class GoodsApplyLogic {
                 goodsApplyItems.get(0).setGoodsId(goodsSpec.getGoodsId());
                 goodsApplyItems.get(0).setGoodsApplyId(goodsApplyAddUp.getGoodsApplyId());
                 goodsApplyItemList.add(goodsApplyItems.get(0));
+
+                if (goodsSpec.getMinPrice().doubleValue() > goodsApplyItems.get(0).getApplyPrice().doubleValue() || goodsSpec.getMaxPrice().doubleValue() < goodsApplyItems.get(0).getApplyPrice().doubleValue())
+                    ifStatus = false;
+
+
             }else {
                 GoodsApplyItem goodsApplyItem = new GoodsApplyItem();
                 goodsApplyItem.setGoodsId(goodsSpec.getGoodsId());
@@ -124,9 +138,20 @@ public class GoodsApplyLogic {
                 goodsApplyItem.setGoodsSpecId(goodsSpec.getGoodsSpecId());
                 goodsApplyItem.setGoodsApplyId(goodsApplyAddUp.getGoodsApplyId());
                 goodsApplyItemList.add(goodsApplyItem);
+
+                if (goodsSpec.getMinPrice().doubleValue() > goodsApplyItem.getApplyPrice().doubleValue() || goodsSpec.getMaxPrice().doubleValue() < goodsApplyItem.getApplyPrice().doubleValue())
+                    ifStatus = false;
             }
+
         }
 
+        if (ifStatus)
+            goodsApplyAddUp.setStatus(ExamineStatusEnum.OK.getKey());
+        else
+            goodsApplyAddUp.setStatus(ExamineStatusEnum.WAIT.getKey());
+
+        goodsApplyAddUp.insert();
+
         goodsApplyItemService.saveBatch(goodsApplyItemList);
     }
 
@@ -142,6 +167,8 @@ public class GoodsApplyLogic {
 
         List<GoodsApplyItem> goodsApplyItemList = new ArrayList<>();
 
+        Boolean ifStatus = true;
+
         for (GoodsSpec goodsSpec : goodsSpecs) {
             List<GoodsApplyItem> goodsApplyItems = goodsApplyAddUp.getGoodsApplyItems().stream()
                     .filter(item -> item.getGoodsSpecId().equals(goodsSpec.getGoodsSpecId()))
@@ -151,6 +178,9 @@ public class GoodsApplyLogic {
                 goodsApplyItems.get(0).setGoodsId(goodsSpec.getGoodsId());
                 goodsApplyItems.get(0).setGoodsApplyId(goodsApplyAddUp.getGoodsApplyId());
                 goodsApplyItemList.add(goodsApplyItems.get(0));
+
+                if (goodsSpec.getMinPrice().doubleValue() > goodsApplyItems.get(0).getApplyPrice().doubleValue() || goodsSpec.getMaxPrice().doubleValue() < goodsApplyItems.get(0).getApplyPrice().doubleValue())
+                    ifStatus = false;
             }else {
                 GoodsApplyItem goodsApplyItem = new GoodsApplyItem();
                 goodsApplyItem.setGoodsId(goodsSpec.getGoodsId());
@@ -158,9 +188,24 @@ public class GoodsApplyLogic {
                 goodsApplyItem.setGoodsSpecId(goodsSpec.getGoodsSpecId());
                 goodsApplyItem.setGoodsApplyId(goodsApplyAddUp.getGoodsApplyId());
                 goodsApplyItemList.add(goodsApplyItem);
+
+                if (goodsSpec.getMinPrice().doubleValue() > goodsApplyItem.getApplyPrice().doubleValue() || goodsSpec.getMaxPrice().doubleValue() < goodsApplyItem.getApplyPrice().doubleValue())
+                    ifStatus = false;
             }
         }
 
+        if (ifStatus)
+            goodsApplyAddUp.setStatus(ExamineStatusEnum.OK.getKey());
+        else
+            goodsApplyAddUp.setStatus(ExamineStatusEnum.WAIT.getKey());
+
         goodsApplyItemService.saveBatch(goodsApplyItemList);
     }
+
+    public void approve(String goodsApplyId, String status) {
+        GoodsApply goodsApply = new GoodsApply();
+        goodsApply.setGoodsApplyId(goodsApplyId);
+        goodsApply.setStatus(status);
+        goodsApply.updateById();
+    }
 }

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

@@ -423,15 +423,6 @@ public class GoodsLogic {
         if (StringUtils.isNotBlank(goodsBean.getUmsDiscountCode()) && !UMSDiscountCodeEnum.existDiscountCodeByCode(goodsBean.getUmsDiscountCode())) {
             throw new RemoteServiceException("补贴品类不存在");
         }
-        //设置企业微信id
-        AdminUserCom adminUser = commonLogic.getAdminUser(request);
-        if (StringUtils.isEmpty(adminUser.getLoginCompanyWechatId())) {
-            throw new RemoteServiceException("无效微信企业id");
-        }
-        goodsBean.setCompanyWechatId(adminUser.getLoginCompanyWechatId());
-        goodsBean.setCompanyName(adminUser.getLoginCompanyName());
-
-        final AdminCompanyWechat companyWechat = adminCompanyWechatService.getById(adminUser.getLoginCompanyWechatId());
 
         Date creatDate = new Date();
         List<GoodsSpec> goodsSpecList = goodsBean.getGoodsSpecs();

src/main/resources/mapper/CountMapper.xml

@@ -65,7 +65,7 @@
             <foreach item="item" index="index" collection="websitIds" open="(" separator="," close=")">
                 #{item}
             </foreach>
-        </if>-->
+        </if>
     </select>