门店相关接口

lb-app/src/main/java/com/ydd/app/controller/CommonApi.java

@@ -64,7 +64,6 @@ public class CommonApi extends BaseController {
             return BaseResult.success(result);
         } catch (Exception e) {
             logger.error("上传异常",e);
-            e.printStackTrace();
             return BaseResult.error(FILE_UPLOAD_ERROR.MSG);
         }
     }
@@ -106,8 +105,8 @@ public class CommonApi extends BaseController {
      */
     @ApiOperation("帮助中心栏目")
     @RequestMapping(value = "/help", method = RequestMethod.GET)
-    public BaseResult<List<HelpDto>> help() {
-        return BaseResult.success("OK",iHelpColumnService.getAll());
+    public BaseResult<List<HelpDto>> help(@RequestParam("type") Integer type) {
+        return BaseResult.success("OK",iHelpColumnService.getAll(type));
     }
     /**
      * 帮助中心

lb-app/src/main/java/com/ydd/app/controller/StoreApi.java

@@ -97,15 +97,11 @@ public class StoreApi extends BaseController {
     @RequestMapping(value = "/delivery", method = RequestMethod.POST)
     @AccessToken
     public ResponseResult delivery(@RequestBody @Validated StoreStatusDto dto) {
-        if (StringUtils.isNotBlank(dto.getDeliveryIdStr())) {
-            JSONObject json = apiStoreService.queryhopDelivery(getLoginId(), dto);
-            if (json.get("code") != null) {
-                return ResponseResult.error((ResponseResultCodeEnum) json.get("code"));
-            } else {
-                return ResponseResult.success(json);
-            }
+        JSONObject json = apiStoreService.queryhopDelivery(getLoginId(), dto);
+        if (json.get("code") != null) {
+            return ResponseResult.error((ResponseResultCodeEnum) json.get("code"));
         } else {
-            return ResponseResult.error(ResponseResultCodeEnum.SHOP_DELIVERY_NOT_FOUND);
+            return ResponseResult.success(json);
         }
     }
 

lb-app/src/main/java/com/ydd/app/dto/StoreStatusDto.java

@@ -26,6 +26,6 @@ public class StoreStatusDto extends BaseDto implements Serializable {
 
     private String deliveryIdStr;
 
-    private String status;
+    private Integer status;
 
 }

lb-app/src/main/java/com/ydd/app/service/impl/ApiStoreServiceImpl.java

@@ -2,6 +2,7 @@ package com.ydd.app.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.ydd.api.DeliveryService;
 import com.ydd.app.ShopEditUtils;
 import com.ydd.app.ShopEntityUtils;
@@ -31,6 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -272,11 +274,12 @@ public class ApiStoreServiceImpl implements ApiStoreService {
             json.put("code", ResponseResultCodeEnum.SHOP_NOT_EXIST);
             return  json;
         }
-        String deliverIds = storeStatusDto.getDeliveryIdStr();
-        if(StatusEnum.SHOW.getStatus().equals(storeStatusDto.getStatus())){
-            iShopDeliveryDisableService.remove(new QueryWrapper<ShopDeliveryDisable>().in("delivery_type",deliverIds).eq("shop_id",shop.getId()));
+        String deliverIdStr = storeStatusDto.getDeliveryIdStr();
+        List<String> deliverIds= Arrays.stream(deliverIdStr.split(",")).collect(Collectors.toList());
+        if(StatusEnum.SHOW.getStatus()==storeStatusDto.getStatus()){
+            iShopDeliveryDisableService.remove(new UpdateWrapper<ShopDeliveryDisable>().in("delivery_type",deliverIds).eq("shop_id",shop.getId()));
         }else{
-            String[] ids = deliverIds.split(",");
+            String[] ids = deliverIdStr.split(",");
             for(int i=0;i<ids.length;i++){
                 ShopDeliveryDisable bean = new ShopDeliveryDisable();
                 bean.setAppId(storeStatusDto.getAppId());

lb-module/src/main/java/com/ydd/module/mapper/HelpColumnMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ydd.module.domain.HelpColumn;
 import com.ydd.module.dto.HelpDto;
 import com.ydd.module.dto.HelpSecondDto;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -18,12 +19,12 @@ public interface HelpColumnMapper extends BaseMapper<HelpColumn> {
      * 查询所有一级栏目
      * @return
      */
-    List<HelpDto> getAll();
+    List<HelpDto> getAll(Integer type);
 
     /**
      * 查询二级栏目
      * @param pId 父类id
      * @return
      */
-    List<HelpSecondDto> getByFirstId(Integer pId);
+    List<HelpSecondDto> getByFirstId(@Param("pId") Integer pId,@Param("type")  Integer type);
 }

lb-module/src/main/java/com/ydd/module/service/IHelpColumnService.java

@@ -27,7 +27,7 @@ public interface IHelpColumnService extends IService<HelpColumn> {
      * 获取所有栏目
      * @return
      */
-    List<HelpDto> getAll();
+    List<HelpDto> getAll(Integer type);
 
     /**
      * 帮助中心内容

lb-module/src/main/java/com/ydd/module/service/impl/HelpColumnServiceImpl.java

@@ -50,11 +50,11 @@ public class HelpColumnServiceImpl extends ServiceImpl<HelpColumnMapper, HelpCol
      * @return
      */
     @Override
-    public List<HelpDto> getAll() {
-        List<HelpDto> dtos = baseMapper.getAll();
+    public List<HelpDto> getAll(Integer type) {
+        List<HelpDto> dtos = baseMapper.getAll(type);
         for (HelpDto d : dtos){
             // 查询二级栏目
-            d.setHelpSeconds(baseMapper.getByFirstId(d.getFirstColumnId()));
+            d.setHelpSeconds(baseMapper.getByFirstId(d.getFirstColumnId(),type));
         }
         return dtos;
     }

lb-module/src/main/resources/mapper/module/HelpColumnMapper.xml

@@ -6,10 +6,12 @@
 
 
     <select id="getAll" resultType="com.ydd.module.dto.HelpDto">
-        SELECT id as firstColumnId ,`name` as firstColumnNames from lb_help_column WHERE p_id is null and deleted = 0 ORDER BY sort desc
+        SELECT id as firstColumnId ,`name` as firstColumnNames
+        from lb_help_column WHERE p_id is null and deleted = 0 and type=#{type} ORDER BY sort desc
     </select>
 
     <select id="getByFirstId" resultType="com.ydd.module.dto.HelpSecondDto">
-        SELECT id as secondColumnId ,`name` as secondColumnNames from lb_help_column WHERE p_id = #{pId} and deleted = 0 ORDER BY sort desc
+        SELECT id as secondColumnId ,`name` as secondColumnNames
+        from lb_help_column WHERE p_id = #{pId} and deleted = 0 and type=#{type} ORDER BY sort desc
     </select>
 </mapper>

lb-module/src/main/resources/mapper/module/HelpMapper.xml

@@ -10,7 +10,7 @@
         FROM
             lb_help
         WHERE second_column_id = #{secondColumnId}
-        AND type = #{type}
+<!--        AND type = #{type}-->
         AND deleted = 0
         ORDER BY
             sort DESC

lb-module/src/main/resources/mapper/module/ShopDeliveryDisableMapper.xml

@@ -14,9 +14,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="shopDelivery" resultType="com.ydd.module.dto.StoreDeliveryDto">
         SELECT d.type deliveryId,d.`name` deliveryName,sd.bind_status,if(sd.bind_status!=1,sd.auth_msg,'') failMsg,
         if(di.id is null,1,0) status
-        from lb_dsp_delivery d,lb_shop_delivery sd
-        LEFT JOIN lb_shop_delivery_disable di on sd.shop_id=di.shop_id
-        where sd.deleted=0  and sd.delivery_id=d.id and sd.shop_id=#{shopId}
+        from lb_dsp_delivery d
+        JOIN lb_shop_delivery sd on sd.delivery_id = d.id
+        LEFT JOIN lb_shop_delivery_disable di ON sd.shop_id = di.shop_id and d.type = di.delivery_type and di.deleted=0
+        where sd.deleted=0   and sd.shop_id=#{shopId}
     </select>
 
 </mapper>

lb-module/src/main/resources/mapper/module/orderMapper.xml

@@ -2189,40 +2189,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getSubsidyList" resultType="com.ydd.module.dto.SubsidyStatisticsDto">
         SELECT
-        original as originalAmount,
-        reala as realAmount,
-        coup as couponAmount,
-        (original - reala) as subsidyAmount,
+        sum(original) as originalAmount,
+        sum(reala) as realAmount,
+        sum(coup) as couponAmount,
+        (sum(original) - sum(reala)) as subsidyAmount,
         delivery_name as deliveryName,
         tim as date,
-        commission as commission,
-        if(original - reala &gt;0,-(original-reala+commission),abs(original - reala)-commission) as profit
+        sum(commission) as commission,
+        if(sum(original) - sum(reala)  &gt;0,-(sum(original) - sum(reala)+sum(commission)),abs(sum(original) - sum(reala))-sum(commission)) as profit
         FROM
         (
         SELECT
-        sum(o.max_amount) original,
-        sum(
-        o.pay_amount - o.tip_amount
-        ) reala,
-        sum(
-        o.pay_amount
-        ) realb,
+        o.max_amount original,
+        o.pay_amount - o.tip_amount reala,
+        o.pay_amount realb,
         (select SUM(if(agent_id is not null,commission,0)) from lb_profits_detail d where d.order_id= o.id)commission,
-        sum( o.coupon_amount) coup,
+        o.coupon_amount coup,
         o.delivery_name,
         DATE_FORMAT(o.create_time, '%Y-%m-%d') tim
         FROM
         lb_order o
         WHERE
-        o.id in(select DISTINCT order_id from lb_profits_detail d where    d.create_time &gt;= #{params.startTime}
-        AND d.create_time &lt; #{params.endTime} and origin_source=0)
+        o.id in(select DISTINCT order_id from lb_profits_detail d where    d.create_time &gt;=  #{params.startTime}
+        AND d.create_time  &lt; #{params.endTime} and origin_source=0)
         and o.delivery_status = 4
         and o.payment_type!=5
         and o.dada_dsp_id is null
-        GROUP BY
-        o.delivery_name,
-        DATE_FORMAT(o.create_time, '%Y-%m-%d')
         ) t
+        GROUP BY deliveryName,date
         ORDER BY date DESC
     </select>