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

bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/manage/BdWaresController.java

@@ -1037,6 +1037,19 @@ public class BdWaresController extends BaseController {
         return AjaxResult.success(list);
     }
 
+    /**
+     * 根据商品类型查询商品列表全部数据
+     *
+     * @return
+     */
+    @GetMapping("/find-all-maker")
+    public AjaxResult findAllMaker(WaresParams waresParams) {
+        Integer pkCountry = SecurityUtils.getPkCountry();
+        Integer systemType = SecurityUtils.getSystemType();
+        List<BdWares> list = iBdWaresService.listByMaker(waresParams,pkCountry,systemType);
+        return AjaxResult.success(list);
+    }
+
     /**
      * 计算商品业绩
      */

bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresMapper.java

@@ -179,4 +179,7 @@ public interface BdWaresMapper extends BaseMapper<BdWares> {
      */
     List<BdWaresExt> listWaresNoSale(@Param("param") WaresNoSaleParam param);
 
+    List<BdWares> listByMaker(@Param("param") WaresParams waresParams,
+                              @Param("pkCountry") Integer pkCountry,
+                              @Param("systemType") Integer systemType);
 }

bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresService.java

@@ -247,4 +247,5 @@ public interface IBdWaresService extends IService<BdWares> {
      */
     List<BdWaresExt> listWaresNoSale(WaresNoSaleParam param);
 
+    List<BdWares> listByMaker(WaresParams waresParams, Integer pkCountry, Integer systemType);
 }

bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java

@@ -1611,4 +1611,9 @@ public class BdWaresServiceImpl extends ServiceImpl<BdWaresMapper, BdWares> impl
         return baseMapper.listWaresNoSale(param);
     }
 
+    @Override
+    public List<BdWares> listByMaker(WaresParams waresParams, Integer pkCountry, Integer systemType) {
+        return baseMapper.listByMaker(waresParams,pkCountry,systemType);
+    }
+
 }

bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml

@@ -493,5 +493,25 @@
         </if>
         order by bw.wares_name
     </select>
+    <select id="listByMaker" resultType="com.hzs.common.domain.sale.wares.BdWares">
+        SELECT
+            bw.*
+        FROM
+            BD_WARES bw LEFT JOIN BD_WARES_EXTEND bwe ON bw.PK_ID = bwe.PK_WARES
+        WHERE
+            bw.PK_COUNTRY = #{pkCountry}
+        <if test="param.isMakerGift != null">
+            and bwe.IS_MAKER_GIFT = #{param.isMakerGift}
+        </if>
+        <if test="param.specialArea != null">
+            and bw.SPECIAL_AREA = #{param.specialArea}
+        </if>
+        <if test="param.queryName != null and param.queryName != ''">
+            AND (
+            wares_name LIKE CONCAT('%', #{param.queryName}, '%')
+            OR wares_code LIKE CONCAT('%', #{param.queryName}, '%')
+            )
+        </if>
+    </select>
 
 </mapper>