Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/PartnerOwnController.java

@@ -187,6 +187,14 @@ public class PartnerOwnController  extends BaseController {
     {
         return   success(partnerList.hotGoodsList(partnerId));
     }
+    /**
+     * 热销商品列表
+     */
+    @GetMapping("/newHotGoodsList")
+    public CommonResult newHotGoodsList()
+    {
+        return   success(partnerList.newHotGoodsList());
+    }
 
 
     /**

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/mapper/AppInspectionPartnerMapper.java

@@ -20,6 +20,7 @@ import java.util.Map;
 @Mapper
 public interface AppInspectionPartnerMapper extends BaseMapper<ShopMallPartners> {
     ShopMallPartners selectById(@Param("id") Long id);
+    ShopMallPartners selectByIdNew();
     IPage<PartnerListVo> partnerList(Page<PartnerListVo> page, @Param("vo") PartnerListQuery partnerListQuery);
     PartnerListVo shopDetail(PartnerListQuery partnerListQuery);
     void addSalesNum(@Param("partnerId") Long partnerId);
@@ -32,6 +33,7 @@ public interface AppInspectionPartnerMapper extends BaseMapper<ShopMallPartners>
     Integer allAmount(@Param("partnerId") Long partnerId);
     Integer  todayAmount(@Param("partnerId") Long partnerId,@Param("timeStr") String timeStr);
     List<HotGoodsVo> hotGoodsList(@Param("partnerId") Long partnerId,@Param("dateStr")String dateStr);
+    List<HotGoodsVo> newHotGoodsList(@Param("dateStr")String dateStr);
     IPage<GoodsVo> manageGoodsList(Page<GoodsVo> page,@Param("partnerId") Long partnerId, @Param("isListing")String isListing,@Param("goodsTitle") String goodsTitle);
     IPage<OrderAppDetail> orderList(Page<OrderAppDetail> page,@Param("partnerId") Long partnerId, @Param("phoneNum") String phoneNum,@Param("title") String title);
     List<PartnerWorker> getWorkList(@Param("partnerId")Long partnerId, @Param("postId") Long postId, @Param("workName") String workName, @Param("phoneNum")String phoneNum);

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/AppInspectionPartnerService.java

@@ -49,6 +49,7 @@ public interface AppInspectionPartnerService extends IService<ShopMallPartners>
    JSONObject newChartInfoRatio(String unit);
    List<OrderInfo> orderInfo(Long partnerId);
    List<HotGoodsVo> hotGoodsList(Long partnerId);
+   List<HotGoodsVo> newHotGoodsList();
    void addGoods(ShopInspectionGoods goods) throws Exception;
    IPage<GoodsVo> goodsList(Page<GoodsVo> page,Long partnerId, String isListing, String goodsTitle);
    List<JSONObject> canUseGoods(Long partnerId);

dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/service/impl/AppInspectionPartnerServiceImpl.java

@@ -983,6 +983,11 @@ public class AppInspectionPartnerServiceImpl extends ServiceImpl<AppInspectionPa
         String dateStr = DateUtil.format(new Date(), "yyyy-MM-dd");
         return baseMapper.hotGoodsList(partnerId,dateStr);
     }
+    @Override
+    public List<HotGoodsVo> newHotGoodsList() {
+        String dateStr = DateUtil.format(new Date(), "yyyy-MM-dd");
+        return baseMapper.newHotGoodsList(dateStr);
+    }
 
     @Override
     @Transactional(rollbackFor = Exception.class)

dl-module-inspection/src/main/resources/mapper/inspection/AppInspectionPartnerMapper.xml

@@ -6,6 +6,9 @@
     <select id="selectById" resultType="cn.iocoder.yudao.module.shop.entity.ShopMallPartners" >
         select  * from shop_mall_partners where  partner_id = #{id}
     </select>
+    <select id="selectByIdNew" resultType="cn.iocoder.yudao.module.shop.entity.ShopMallPartners" >
+        select  * from shop_mall_partners
+    </select>
 <select id="partnerList" parameterType="cn.iocoder.yudao.module.inspection.query.PartnerListQuery" resultType="cn.iocoder.yudao.module.inspection.vo.PartnerListVo">
     SELECT
         smp.partner_logo,
@@ -143,6 +146,20 @@ GROUP BY
 	goods.id
 	order by salesNum desc
 </select>
+<select id="newHotGoodsList" resultType="cn.iocoder.yudao.module.inspection.vo.HotGoodsVo">
+SELECT
+	goods.title AS goodsName,
+	SUM( case when (ii.`status`='1' and ii.is_pass = '1') or  (ii.`status`='0') then   oi.goods_price else 0 end   ) AS salesAmount,
+	SUM( case when (ii.`status`='1' and ii.is_pass = '1') or  (ii.`status`='0') then   1 else 0 end   ) AS salesNum
+FROM
+    order_info oi
+	left join shop_inspection_goods goods on goods.id = oi.goods_id
+	left JOIN inspection_info ii on oi.id = ii.inspection_order_id
+WHERE  validation_time is not null and  validation_time like concat(#{dateStr},'%')
+GROUP BY
+	goods.id
+	order by salesNum desc
+</select>
 <select id="manageGoodsList" resultType="cn.iocoder.yudao.module.inspection.vo.GoodsVo">
 SELECT
     sig.id as goodsId,sig.title as goodsTitle,sig.image as goodsImage,sig.price,count(oi.id) as salesNum,sig.listing_status,sig.reject_reason
@@ -411,7 +428,7 @@ FROM
     FROM
         order_info oi
     INNER JOIN inspection_info ii on oi.id = ii.inspection_order_id
-    left join system_dict_data sdd on sdd.value = ii.customer_source and sdd.dict_type = concat('customer_source-',#{partnerId})
+    left join system_dict_data sdd on sdd.value = ii.customer_source
     WHERE  ii.create_time BETWEEN #{startTime} and #{endTime}
 	GROUP BY sdd.remark
 	having count(1)>0