Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/pms
-  newTag: ca19a936c153a8b533fbfe359cd6ae36e37ad991
+  newTag: 16203e068976be09d2b4a8e92d31218ba49b7e64

src/main/java/com/mmc/pms/controller/lease/LeaseGoodsController.java

@@ -17,7 +17,6 @@ import com.mmc.pms.service.lease.LeaseGoodsService;
 import io.swagger.annotations.*;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -87,9 +86,8 @@ public class LeaseGoodsController extends BaseController {
 
     @ApiOperation(value = "feign-根据地址id查询是否有商品绑定")
     @GetMapping("feignLeaseGoodsInfoByAddressId")
-    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = LeaseGoodsVO.class)})
-    @ApiIgnore
-    public Integer feignLeaseGoodsInfoByAddressId(@RequestParam Integer id) {
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    public ResultBody feignLeaseGoodsInfoByAddressId(@RequestParam Integer id) {
         return leaseGoodsService.feignLeaseGoodsInfoByAddressId(id);
     }
 }

src/main/java/com/mmc/pms/dao/lease/LeaseGoodsDao.java

@@ -71,5 +71,9 @@ public interface LeaseGoodsDao {
 
     void removeWareInfo(List<Integer> list);
 
-    Integer feignLeaseGoodsInfoByAddressId(Integer id);
+    int feignLeaseGoodsInfoByAddressId(Integer id);
+
+    int countLeaseGoodsByApp(LeaseGoodsQO param);
+
+    List<LeaseGoodsDO> listLeaseGoodsByApp(LeaseGoodsQO param);
 }

src/main/java/com/mmc/pms/service/lease/LeaseGoodsService.java

@@ -27,5 +27,5 @@ public interface LeaseGoodsService {
 
     ResultBody batchRemoveWareInfo(List<Integer> list);
 
-    Integer feignLeaseGoodsInfoByAddressId(Integer id);
+    ResultBody feignLeaseGoodsInfoByAddressId(Integer id);
 }

src/main/java/com/mmc/pms/service/lease/impl/LeaseGoodsServiceImpl.java

@@ -121,24 +121,36 @@ public class LeaseGoodsServiceImpl implements LeaseGoodsService {
 
     @Override
     public ResultBody leaseGoodsList(LeaseGoodsQO param, LoginSuccessDTO loginSuccessDTO) {
-        if (loginSuccessDTO == null || loginSuccessDTO.getRoleInfo().getSuperAdmin().equals(1)) {
-            // 小程序和超级管理员获取所有商品信息
-            return ResultBody.success(getLeaseGoodsInfo(param));
-        } else {
+        if (loginSuccessDTO != null && loginSuccessDTO.getRoleInfo().getSuperAdmin().equals(1)) {
+            // 超级管理员获取所有商品信息
+            return ResultBody.success(getLeaseGoodsInfo(param, 1));
+        } else if (loginSuccessDTO != null && !loginSuccessDTO.getRoleInfo().getSuperAdmin().equals(1)) {
             // 非超级管理员获取自家的商品信息
             param.setUserAccountId(loginSuccessDTO.getUserAccountId());
-            return ResultBody.success(getLeaseGoodsInfo(param));
+            return ResultBody.success(getLeaseGoodsInfo(param, 1));
+        } else {
+            return ResultBody.success(getLeaseGoodsInfo(param, 0));
         }
     }
 
-    private PageResult getLeaseGoodsInfo(LeaseGoodsQO param) {
-        int count = leaseGoodsDao.countLeaseGoods(param);
+    private PageResult getLeaseGoodsInfo(LeaseGoodsQO param, Integer type) {
+        int count;
+        if (type.equals(1)) {
+            count = leaseGoodsDao.countLeaseGoods(param);
+        } else {
+            count = leaseGoodsDao.countLeaseGoodsByApp(param);
+        }
         if (count == 0) {
             return PageResult.buildPage(param.getPageNo(), param.getPageSize(), count);
         }
         Integer pageNo = param.getPageNo();
         param.buildCurrentPage();
-        List<LeaseGoodsDO> leaseGoodsDOList = leaseGoodsDao.listLeaseGoods(param);
+        List<LeaseGoodsDO> leaseGoodsDOList;
+        if (type.equals(1)) {
+            leaseGoodsDOList = leaseGoodsDao.listLeaseGoods(param);
+        } else {
+            leaseGoodsDOList = leaseGoodsDao.listLeaseGoodsByApp(param);
+        }
         // 转成vo
         List<LeaseGoodsVO> leaseGoodsVOList = leaseGoodsDOList.stream().map(LeaseGoodsDO::buildLeaseGoodsVO)
                 .skip(param.getPageNo()).limit(param.getPageSize()).collect(Collectors.toList());
@@ -147,7 +159,7 @@ public class LeaseGoodsServiceImpl implements LeaseGoodsService {
         List<CompanyInfoVO> companyInfoVOS = userAppApi.listCompanyInfoByBUIds(userIds);
         leaseGoodsVOList = leaseGoodsVOList.stream().peek(d -> {
             for (CompanyInfoVO companyInfoVO : companyInfoVOS) {
-                if (companyInfoVO.getBackUserAccountId().equals(d.getUserAccountId())){
+                if (companyInfoVO.getBackUserAccountId().equals(d.getUserAccountId())) {
                     d.setCompanyName(companyInfoVO.getCompanyName());
                     break;
                 }
@@ -190,7 +202,7 @@ public class LeaseGoodsServiceImpl implements LeaseGoodsService {
     }
 
     @Override
-    public Integer feignLeaseGoodsInfoByAddressId(Integer id) {
-        return leaseGoodsDao.feignLeaseGoodsInfoByAddressId(id);
+    public ResultBody feignLeaseGoodsInfoByAddressId(Integer id) {
+        return ResultBody.success(leaseGoodsDao.feignLeaseGoodsInfoByAddressId(id));
     }
 }

src/main/resources/mapper/lease/LeaseGoodsDao.xml

@@ -141,7 +141,10 @@
                 logistics_company = #{logisticsCompany},
             </if>
             <if test="modeOfDelivery != null">
-                mode_of_delivery = #{modeOfDelivery}
+                mode_of_delivery = #{modeOfDelivery},
+            </if>
+            <if test="showPrice != null">
+                show_price = #{showPrice}
             </if>
         </set>
         where id = #{id}
@@ -416,4 +419,72 @@
         where ship_address = #{id}
            or return_address = #{id}
     </select>
+    <select id="countLeaseGoodsByApp" resultType="java.lang.Integer">
+        select count(*) from lease_goods
+        <where>
+            shelf_status = 1
+            <if test="tradeName != null and tradeName != ''">
+                and (trade_name LIKE CONCAT('%',#{tradeName},'%'))
+            </if>
+            <if test="productTypeId != null">
+                and product_type_id = #{productTypeId}
+            </if>
+            <if test="brandInfoId != null">
+                and brand_info_id = #{brandInfoId}
+            </if>
+            <if test="userAccountId != null">
+                and user_account_id = #{userAccountId}
+            </if>
+            <if test="districtCode != null and districtCode != ''">
+                and district_code = #{districtCode}
+            </if>
+        </where>
+    </select>
+    <select id="listLeaseGoodsByApp" resultMap="leaseGoodsMap">
+        SELECT
+        lg.id,
+        lg.trade_name,
+        lg.product_type_id,
+        lg.shelf_status,
+        lg.selling_point,
+        lg.product_param,
+        lg.user_account_id,
+        lg.show_price,
+        lg.min_lease_term,
+        lg.max_lease_term,
+        lg.create_time,
+        lgr.id resourceId,
+        lgr.type,
+        lgr.url,
+        lps.cash_pledge,
+        lps.three_days_rental,
+        lps.seven_days_rental,
+        lps.thirty_days_rental,
+        lps.ninety_days_rental,
+        lps.max_days_rental,
+        lps.stock
+        FROM
+        lease_goods lg
+        LEFT JOIN lease_goods_resources lgr ON lgr.lease_goods_id = lg.id
+        LEFT JOIN lease_price_stock lps ON lps.lease_goods_id = lg.id
+        <where>
+            shelf_status = 1
+            <if test="tradeName != null and tradeName != ''">
+                and (lg.trade_name LIKE CONCAT('%',#{tradeName},'%'))
+            </if>
+            <if test="productTypeId != null">
+                and lg.product_type_id = #{productTypeId}
+            </if>
+            <if test="brandInfoId != null">
+                and lg.brand_info_id = #{brandInfoId}
+            </if>
+            <if test="userAccountId != null">
+                and lg.user_account_id = #{userAccountId}
+            </if>
+            <if test="districtCode != null and districtCode != ''">
+                and district_code = #{districtCode}
+            </if>
+        </where>
+        order by lg.shelf_status DESC, lg.sort DESC
+    </select>
 </mapper>
\ No newline at end of file