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

fs-admin/src/main/java/com/fs/crm/controller/CrmCustomerController.java

@@ -59,6 +59,19 @@ public class CrmCustomerController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * @Description: 模糊查询客户姓名
+     * @Param:
+     * @Return:
+     * @Author xgb
+     * @Date 2025/9/22 16:04
+     */
+    @GetMapping("/getCustName")
+    public List<String> getCustName(CrmCustomer crmCustomer){
+        startPage();
+        return crmCustomerService.getCustName(crmCustomer);
+    }
+
     @PreAuthorize("@ss.hasPermi('crm:customer:addLine')")
     @Log(title = "创建线索客户", businessType = BusinessType.INSERT)
     @PostMapping("/addLine")

fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreOrderScrmController.java

@@ -491,6 +491,16 @@ public class FsStoreOrderScrmController extends BaseController {
                 }
             }
             expressInfoDTO = expressService.getExpressInfo(order.getOrderCode(), order.getDeliverySn(), order.getDeliveryId(), lastFourNumber);
+            // 查看订单信息状态的时候发现状态不一致更新状态
+            if(order.getStatus()==2 &&expressInfoDTO.getState().equals("3")&&(expressInfoDTO.getStateEx().equals("301")||expressInfoDTO.getStateEx().equals("302")||expressInfoDTO.getStateEx().equals("304")||expressInfoDTO.getStateEx().equals("311"))){
+                FsStoreOrderScrm map=new FsStoreOrderScrm();
+                map.setDeliveryStatus(Integer.parseInt(expressInfoDTO.getState()));
+                map.setId(order.getId());
+                map.setDeliveryType(expressInfoDTO.getStateEx());
+                fsStoreOrderService.updateFsStoreOrder(map);
+                // 如果是正常签收，更新订单状态
+                fsStoreOrderService.finishOrder(order.getId());
+            }
         }
         return R.ok().put("data", expressInfoDTO);
     }

fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreStatisticsScrmController.java

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -86,6 +87,36 @@ public class FsStoreStatisticsScrmController extends BaseController
         }
     }
 
+
+    @PreAuthorize("@ss.hasPermi('store:statistics:storeOrder')")
+    @GetMapping("/storeOrderStatistics")
+    public R storeOrderStatistics(FsStoreStatisticsParam param)
+    {
+
+        TimeUtils.TimeEntity timeEntity=TimeUtils.parseTimeTwo(param.getType()==null?null:param.getType().toString(),param.getStartTime(),param.getEndTime());
+        // 判断 员工是否为空
+        timeEntity.setCompanyUserId(param.getCompanyUserId());
+        timeEntity.setCompanyId(param.getCompanyId());
+        timeEntity.setDeptId(param.getDeptId());
+        timeEntity.setOrderType(param.getOrderType());
+        timeEntity.setOrderMedium(param.getOrderMedium());
+
+        Map<String,Object> map = timeEntity.toMap();
+        map.put("queryType",param.getQueryType());
+        map.put("amountType",param.getAmountType());
+
+        // 公司汇总
+        List<FsStoreOrderCountsVO> companyTableData = storeOrderService.selectFsStoreOrderGroupByCompanyId(map);
+
+        // 按部门汇总
+        List<FsStoreOrderCountsVO> deptTableData = storeOrderService.selectFsStoreOrderGroupByDeptId(map);
+
+        // 按员工汇总
+        List<FsStoreOrderCountsVO> userTableData = storeOrderService.selectFsStoreOrderGroupByUserId(map);
+
+        return R.ok().put("companyTableData",companyTableData).put("deptTableData",deptTableData).put("userTableData",userTableData);
+    }
+
     @PreAuthorize("@ss.hasPermi('store:statistics:storeProduct')")
     @GetMapping("/storeProduct")
     public R storeProduct(FsStoreStatisticsParam param)

fs-common/src/main/java/com/fs/common/utils/TimeUtils.java

@@ -159,6 +159,121 @@ public class TimeUtils
         return new TimeEntity(sqlDateFormat, dateFormat, beginDate, endDate, cycleNum, beginTime, finalTime, null);
     }
 
+    /**
+     * @Description: 传日期优先使用日期，否则使用类型
+     * @Param:
+     * @Return:
+     * @Author xgb
+     * @Date 2025/9/19 10:33
+     */
+    public static TimeEntity parseTimeTwo(String type,String startTime,String endTime) {
+        Date beginDate = DateUtil.date();
+        Date endDate = DateUtil.date();
+        int cycleNum = 12;
+        String sqlDateFormat = "%Y%m%d";
+        String dateFormat = "yyyyMMdd";
+
+        if (StrUtil.isNotEmpty(startTime) && StrUtil.isNotEmpty(endTime)) {
+            Date start;
+            Date end;
+            if (startTime.length() == 6) {
+                start = DateUtil.parse(startTime, "yyyyMM");
+                end = DateUtil.endOfMonth(DateUtil.parse(endTime, "yyyyMM"));
+            } else {
+                start = DateUtil.parse(startTime);
+                end = DateUtil.parse(endTime);
+            }
+//            Integer startMonth = Integer.valueOf(DateUtil.format(start, "yyyyMM"));
+//            Integer endMonth = Integer.valueOf(DateUtil.format(end, "yyyyMM"));
+//            if (startMonth.equals(endMonth)) {
+//                sqlDateFormat = "%Y%m%d";
+//                dateFormat = "yyyyMMdd";
+//                Long diffDay = DateUtil.between(start, end, DateUnit.DAY);
+//                cycleNum = diffDay.intValue() + 1;
+//            } else {
+//                sqlDateFormat = "%Y%m";
+//                dateFormat = "yyyyMM";
+//                int diffYear = Integer.valueOf(endMonth.toString().substring(0, 4)) - Integer.valueOf(startMonth.toString().substring(0, 4));
+//                int diffMonth = endMonth % 100 - startMonth % 100 + 1;
+//                cycleNum = diffYear * 12 + diffMonth;
+//            }
+            beginDate = start;
+            endDate = end;
+        }else if (StrUtil.isNotEmpty(type)) {
+            if (type.matches("^[\\d]{8}$")){
+                sqlDateFormat = "%Y%m%d";
+                dateFormat = "yyyyMMdd";
+            }
+            switch (type) {
+                case "9":
+                    beginDate = DateUtil.beginOfYear(DateUtil.date());
+                    endDate = DateUtil.endOfYear(DateUtil.date());
+                    break;
+                case "10":
+                    beginDate = DateUtil.beginOfYear(DateUtil.offsetMonth(DateUtil.date(), -12));
+                    endDate = DateUtil.endOfYear(DateUtil.offsetMonth(DateUtil.date(), -12));
+                    break;
+                case "7":
+                    beginDate = DateUtil.beginOfQuarter(DateUtil.date());
+                    endDate = DateUtil.endOfQuarter(DateUtil.date());
+                    cycleNum = 3;
+                    break;
+                case "8":
+                    beginDate = DateUtil.beginOfQuarter(DateUtil.offsetMonth(DateUtil.date(), -3));
+                    endDate = DateUtil.endOfQuarter(DateUtil.offsetMonth(DateUtil.date(), -3));
+                    cycleNum = 3;
+                    break;
+                case "5":
+                    beginDate = DateUtil.beginOfMonth(DateUtil.date());
+                    endDate = DateUtil.endOfMonth(DateUtil.date());
+                    sqlDateFormat = "%Y%m%d";
+                    dateFormat = "yyyyMMdd";
+                    cycleNum = (int) DateUtil.between(beginDate, endDate, DateUnit.DAY) + 1;
+                    break;
+                case "6":
+                    beginDate = DateUtil.beginOfMonth(DateUtil.offsetMonth(DateUtil.date(), -1));
+                    endDate = DateUtil.endOfMonth(DateUtil.offsetMonth(DateUtil.date(), -1));
+                    sqlDateFormat = "%Y%m%d";
+                    dateFormat = "yyyyMMdd";
+                    cycleNum = (int) DateUtil.between(beginDate, endDate, DateUnit.DAY) + 1;
+                    break;
+                case "3":
+                    beginDate = DateUtil.beginOfWeek(DateUtil.date());
+                    endDate = DateUtil.endOfWeek(DateUtil.date());
+                    sqlDateFormat = "%Y%m%d";
+                    dateFormat = "yyyyMMdd";
+                    cycleNum = 7;
+                    break;
+                case "4":
+                    beginDate = DateUtil.beginOfWeek(DateUtil.offsetWeek(DateUtil.date(), -1));
+                    endDate = DateUtil.endOfWeek(DateUtil.offsetWeek(DateUtil.date(), -1));
+                    sqlDateFormat = "%Y%m%d";
+                    dateFormat = "yyyyMMdd";
+                    cycleNum = 7;
+                    break;
+                case "1":
+                    beginDate = DateUtil.beginOfDay(DateUtil.date());
+                    endDate = DateUtil.endOfDay(DateUtil.date());
+                    sqlDateFormat = "%Y%m%d";
+                    dateFormat = "yyyyMMdd";
+                    cycleNum = 1;
+                    break;
+                case "2":
+                    beginDate = DateUtil.offsetDay(DateUtil.date(), -1);
+                    endDate = DateUtil.offsetDay(DateUtil.date(), -1);
+                    sqlDateFormat = "%Y%m%d";
+                    dateFormat = "yyyyMMdd";
+                    cycleNum = 1;
+                    break;
+                default:
+                    break;
+            }
+        }
+        Integer beginTime = Integer.valueOf(DateUtil.format(beginDate, dateFormat));
+        Integer finalTime = Integer.valueOf(DateUtil.format(endDate, dateFormat));
+        return new TimeEntity(sqlDateFormat, dateFormat, beginDate, endDate, cycleNum, beginTime, finalTime, null);
+    }
+
     public static class TimeEntity implements Serializable {
         public TimeEntity(String sqlDateFormat, String dateFormat, Date beginDate, Date endDate, Integer cycleNum, Integer beginTime, Integer finalTime, Long[] userIds) {
             this.sqlDateFormat = sqlDateFormat;
@@ -221,6 +336,53 @@ public class TimeUtils
          */
         private Long[] userIds;
 
+        private Long companyUserId;
+
+        private Long deptId;
+
+        /**
+         * 订单类型 字典表字段
+         */
+        String orderType;
+        /**
+         * 来源媒体 字典表字段
+         */
+        String orderMedium;
+
+        public String getOrderType() {
+            return orderType;
+        }
+
+        public void setOrderType(String orderType) {
+            this.orderType = orderType;
+        }
+
+        public String getOrderMedium() {
+            return orderMedium;
+        }
+
+        public void setOrderMedium(String orderMedium) {
+            this.orderMedium = orderMedium;
+        }
+
+        public Long getDeptId() {
+            return deptId;
+        }
+
+        public void setDeptId(Long companyDeptId) {
+            this.deptId = companyDeptId;
+        }
+
+        public Long getCompanyUserId() {
+            return companyUserId;
+        }
+
+        public void setCompanyUserId(Long companyUserId) {
+            this.companyUserId = companyUserId;
+        }
+
+
+
         public Integer getBeginTime() {
             return beginTime;
         }

fs-company/src/main/java/com/fs/hisStore/controller/FsStoreOrderScrmController.java

@@ -261,6 +261,16 @@ public class FsStoreOrderScrmController extends BaseController
                 }
             }
             expressInfoDTO=expressService.getExpressInfo(order.getOrderCode(),order.getDeliverySn(),order.getDeliveryId(),lastFourNumber);
+            // 查看订单信息状态的时候发现状态不一致更新状态
+            if(order.getStatus()==2 &&expressInfoDTO.getState().equals("3")&&(expressInfoDTO.getStateEx().equals("301")||expressInfoDTO.getStateEx().equals("302")||expressInfoDTO.getStateEx().equals("304")||expressInfoDTO.getStateEx().equals("311"))){
+                FsStoreOrderScrm map=new FsStoreOrderScrm();
+                map.setDeliveryStatus(Integer.parseInt(expressInfoDTO.getState()));
+                map.setId(order.getId());
+                map.setDeliveryType(expressInfoDTO.getStateEx());
+                fsStoreOrderService.updateFsStoreOrder(map);
+                // 如果是正常签收，更新订单状态
+                fsStoreOrderService.finishOrder(order.getId());
+            }
         }
         return R.ok().put("data",expressInfoDTO);
     }

fs-company/src/main/java/com/fs/hisStore/controller/FsStoreStatisticsScrmController.java

@@ -50,6 +50,7 @@ public class FsStoreStatisticsScrmController extends BaseController
     private TokenService tokenService;
     @PreAuthorize("@ss.hasPermi('store:statistics:storeOrder')")
     @GetMapping("/storeOrder")
+    @Deprecated
     public R storeOrder(FsStoreStatisticsParam param)
     {
         if(StringUtils.isNotEmpty(param.getUserIds())){
@@ -94,6 +95,42 @@ public class FsStoreStatisticsScrmController extends BaseController
         }
     }
 
+    /**
+     * @Description: 商城订单统计 分别按员工 部门 公司进行统计
+     * @Param:
+     * @Return:
+     * @Author xgb
+     * @Date 2025/9/22 9:13
+     */
+    @PreAuthorize("@ss.hasPermi('store:statistics:storeOrder')")
+    @GetMapping("/storeOrderStatistics")
+    public R storeOrderStatistics(FsStoreStatisticsParam param)
+    {
+
+        TimeUtils.TimeEntity timeEntity=TimeUtils.parseTimeTwo(param.getType()==null?null:param.getType().toString(),param.getStartTime(),param.getEndTime());
+        // 判断 员工是否为空
+        timeEntity.setCompanyUserId(param.getCompanyUserId());
+        timeEntity.setCompanyId(param.getCompanyId());
+        timeEntity.setDeptId(param.getDeptId());
+        timeEntity.setOrderType(param.getOrderType());
+        timeEntity.setOrderMedium(param.getOrderMedium());
+
+        Map<String,Object> map = timeEntity.toMap();
+        map.put("queryType",param.getQueryType());
+        map.put("amountType",param.getAmountType());
+
+        // 公司汇总
+        List<FsStoreOrderCountsVO> companyTableData = storeOrderService.selectFsStoreOrderGroupByCompanyId(map);
+
+        // 按部门汇总
+        List<FsStoreOrderCountsVO> deptTableData = storeOrderService.selectFsStoreOrderGroupByDeptId(map);
+
+        // 按员工汇总
+        List<FsStoreOrderCountsVO> userTableData = storeOrderService.selectFsStoreOrderGroupByUserId(map);
+
+        return R.ok().put("companyTableData",companyTableData).put("deptTableData",deptTableData).put("userTableData",userTableData);
+    }
+
 
     @PreAuthorize("@ss.hasPermi('store:statistics:storeProduct')")
     @GetMapping("/storeProduct")

fs-service/src/main/java/com/fs/crm/mapper/CrmCustomerMapper.java

@@ -972,4 +972,5 @@ public interface CrmCustomerMapper extends BaseMapper<CrmCustomer> {
      */
     List<Long> selectCustomerIdByCompanyUserId(@Param("companyUserId") Long companyUserId);
 
+    List<String> getCustName(CrmCustomer crmCustomer);
 }

fs-service/src/main/java/com/fs/crm/service/ICrmCustomerService.java

@@ -165,4 +165,6 @@ public interface ICrmCustomerService
     void computePayMoney();
 
     List<CrmMyCustomerListQueryVO> selectCrmMyAssistListQuery(CrmMyCustomerListQueryParam param);
+
+    List<String> getCustName(CrmCustomer crmCustomer);
 }

fs-service/src/main/java/com/fs/crm/service/impl/CrmCustomerServiceImpl.java

@@ -1031,4 +1031,9 @@ public class CrmCustomerServiceImpl extends ServiceImpl<CrmCustomerMapper, CrmCu
         return vos;
     }
 
+    @Override
+    public List<String> getCustName(CrmCustomer crmCustomer) {
+        return crmCustomerMapper.getCustName(crmCustomer);
+    }
+
 }

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreOrderScrmMapper.java

@@ -9,7 +9,6 @@ import com.fs.api.param.OrderListParam;
 import com.fs.api.vo.OrderListVO;
 import com.fs.company.param.CompanyStatisticsParam;
 import com.fs.course.dto.FsOrderDeliveryNoteDTO;
-import com.fs.his.domain.FsStoreOrder;
 import com.fs.his.vo.FsStoreOrderExcelVO;
 import com.fs.hisStore.domain.FsStoreOrderScrm;
 import com.fs.hisStore.domain.FsStoreOrderItemScrm;
@@ -1053,7 +1052,7 @@ public interface FsStoreOrderScrmMapper
      * **/
     List<OrderStatisticsVo> selectOrderSaleStatisticsList(@Param("param") OrderStatisticsParam param);
 
-    List<FsStoreOrderCountsVO> selectFsStoreOrderCountsByDept(Map<String, Object> map);
+    List<FsStoreOrderCountsVO> selectFsStoreOrderGroupByCompanyUserId(Map<String, Object> map);
 
     List<FsStoreOrderScrm> computePayMoney(@Param("customerIds")List<Long> customerIds);
 
@@ -1217,4 +1216,10 @@ public interface FsStoreOrderScrmMapper
             "        where order_code = #{orderCode}"+
             "</script>"})
     int updateFsStoreOrderByOrderCode(FsStoreOrderScrm fsStoreOrder);
+
+    List<FsStoreOrderCountsVO> selectFsStoreOrderGroupByCompanyId(Map<String, Object> map);
+
+    List<FsStoreOrderCountsVO> selectFsStoreOrderGroupByDeptId(Map<String, Object> map);
+
+    List<FsStoreOrderCountsVO> selectFsStoreOrderGroupByUserId(Map<String, Object> map);
 }

fs-service/src/main/java/com/fs/hisStore/param/FsStoreStatisticsParam.java

@@ -14,6 +14,15 @@ public class FsStoreStatisticsParam implements Serializable
     String startTime;
     String endTime;
     Long deptId;
+    Long companyId;
+
+    // 查询方式 下单时间-1 发货时间-2
+    private Integer queryType;
+    // 金额等于0-1 金额大于0-2
+    private Integer amountType;
+
+
+
     /**
      * 订单类型 字典表字段
      */
@@ -22,6 +31,11 @@ public class FsStoreStatisticsParam implements Serializable
      * 来源媒体 字典表字段
      */
     String orderMedium;
+    /**
+     * 销售员工Id
+     */
+    Long companyUserId;
+
 
 
 }

fs-service/src/main/java/com/fs/hisStore/service/IFsStoreOrderScrmService.java

@@ -282,4 +282,10 @@ public interface IFsStoreOrderScrmService
      * @param dtoList 订单数据
      * **/
     R importDeliveryNoteExpress(List<FsOrderDeliveryNoteDTO> dtoList);
+
+    List<FsStoreOrderCountsVO> selectFsStoreOrderGroupByCompanyId(Map<String, Object>  map);
+
+    List<FsStoreOrderCountsVO> selectFsStoreOrderGroupByDeptId(Map<String, Object> map);
+
+    List<FsStoreOrderCountsVO> selectFsStoreOrderGroupByUserId(Map<String, Object> map);
 }

fs-service/src/main/java/com/fs/hisStore/vo/FsStoreOrderCountsVO.java

@@ -6,6 +6,7 @@ import java.math.BigDecimal;
 
 @Data
 public class FsStoreOrderCountsVO {
+    private Long id;
     private Long deptId; //不显示
     //员工名字[id] / 部门：部门名称
     private String name;
@@ -27,6 +28,10 @@ public class FsStoreOrderCountsVO {
     private Long cancelOrders;
     //取消金额
     private BigDecimal cancelAmount;
+    // 成交数
+    private Long completeOrders;
+    // 成交金额
+    private BigDecimal completeAmount;
     //成交未发货订单数
     private Long unshippedOrders;
     //成交未发货金额

fs-service/src/main/resources/mapper/crm/CrmCustomerMapper.xml

@@ -437,4 +437,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         order by cu.customer_user_id desc
     </select>
+
+    <select id="getCustName" parameterType="CrmCustomer" resultType="java.lang.String">
+        select distinct customer_name from crm_customer where 1=1
+        <if test="customerName != null">
+            and customer_name like CONCAT('%',#{customerName},'%')
+        </if>
+    </select>
 </mapper>

fs-service/src/main/resources/mapper/hisStore/FsStoreOrderScrmMapper.xml

@@ -836,6 +836,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyId != null  ">
                 AND so.company_id = #{companyId}
             </if>
+            <if test="orderType != null and orderType != ''">
+                AND so.order_type = #{orderType}
+            </if>
+            <if test="orderMedium != null and orderMedium != ''">
+                AND so.order_medium = #{orderMedium}
+            </if>
 
         ) o GROUP BY o.company_user_id
     </select>
@@ -865,8 +871,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         (
         SELECT o.id, o.order_type,i.json_info,i.item_id
         FROM
-        fs_store_order_item i
-        LEFT JOIN fs_store_order o ON o.id = i.order_id
+        fs_store_order_item_scrm i
+        LEFT JOIN fs_store_order_scrm o ON o.id = i.order_id
         LEFT JOIN company_user u ON o.company_user_id = u.user_id
         where i.product_id = #{productId}
         and o.`status` = 3
@@ -883,90 +889,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         ) t
         GROUP BY t.order_type
-        HAVING t.order_type > 0
     </select>
 
     <update id="batchUpdateInOrderCode">
         UPDATE fs_store_order_scrm
-        <set>
-            delivery_sn = CASE
-            <foreach collection="list" item="item">
-                WHEN order_code = #{item.orderNumber} THEN #{item.deliverySn}
-            </foreach>
-            ELSE delivery_sn
-            END,
-            delivery_name = CASE
-            <foreach collection="list" item="item">
-                WHEN order_code = #{item.orderNumber} THEN #{item.deliveryName}
-            </foreach>
-            ELSE delivery_name
-            END,
-            delivery_id = CASE
-            <foreach collection="list" item="item">
-                WHEN order_code = #{item.orderNumber} THEN #{item.deliveryId}
-            </foreach>
-            ELSE delivery_id
-            END,
-
-            delivery_status = CASE
-            <foreach collection="list" item="item">
-                WHEN order_code = #{item.orderNumber} THEN #{item.deliveryStatus}
-            </foreach>
-            ELSE delivery_status
-            END,
-
-            status = CASE
-            WHEN status = 1 THEN 2
-            ELSE status
-            END,
-
-            <if test="list != null and list.size() > 0 and list[0].deliveryPayMoney != null">
-                delivery_pay_money = CASE
-                <foreach collection="list" item="item">
-                    WHEN order_code = #{item.orderNumber} THEN #{item.deliveryPayMoney}
-                </foreach>
-                ELSE delivery_pay_money
-                END,
-            </if>
-
-            <if test="list != null and list.size() > 0 and list[0].deliveryType != null">
-                delivery_type = CASE
-                <foreach collection="list" item="item">
-                    WHEN order_code = #{item.orderNumber} THEN #{item.deliveryType}
-                </foreach>
-                ELSE delivery_type
-                END,
-            </if>
-
-            <if test="list != null and list.size() > 0 and list[0].deliveryPayStatus != null">
-                delivery_pay_status = CASE
-                <foreach collection="list" item="item">
-                    WHEN order_code = #{item.orderNumber} THEN #{item.deliveryPayStatus}
-                </foreach>
-                ELSE delivery_pay_status
-                END,
-            </if>
-
-            <if test="list != null and list.size() > 0 and list[0].deliveryTime != null">
-                delivery_time = CASE
-                <foreach collection="list" item="item">
-                    WHEN order_code = #{item.orderNumber} THEN #{item.deliveryTime}
-                </foreach>
-                ELSE delivery_time
-                END,
-            </if>
-
-            <if test="list != null and list.size() > 0 and list[0].deliveryPayTime != null">
-                delivery_pay_time = CASE
-                <foreach collection="list" item="item">
-                    WHEN order_code = #{item.orderNumber} THEN #{item.deliveryPayTime}
-                </foreach>
-                ELSE delivery_pay_time
-                END
-            </if>
-        </set>
+        SET status = CASE
+        <foreach collection="dtoList" item="item" separator="">
+            WHEN order_code = #{item.orderNumber} THEN #{item.deliveryNoteStatus}
+        </foreach>
+        END
         WHERE order_code IN
-        <foreach collection="list" item="item" open="(" separator="," close=")">
+        <foreach collection="dtoList" item="item" open="(" separator="," close=")">
             #{item.orderNumber}
         </foreach>
     </update>
@@ -977,4 +910,164 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{item}
     </foreach>
     </select>
+    <select id="selectFsStoreOrderGroupByCompanyId" resultType="com.fs.hisStore.vo.FsStoreOrderCountsVO">
+        SELECT
+        company_company_id  AS id,
+        COALESCE(NULLIF(company_name, ''),'客户自购') AS name,
+        <include refid="selectFsStoreOrderConditions" />
+
+        FROM
+        (
+        SELECT so.*,c.company_name,a.audit_status,u.company_id as company_company_id
+        FROM
+        fs_store_order_scrm AS so
+        LEFT JOIN company_user u ON so.company_user_id = u.user_id
+        left join company c ON u.company_id = c.company_id
+        left join fs_store_order_audit_scrm a on a.order_id=so.id
+        where 1=1
+        <include refid="selectFsStoreOrderWhere" />
+
+
+        <if test="companyId != null  ">
+            AND u.company_id = #{companyId}
+        </if>
+
+
+        ) o GROUP BY o.company_company_id
+    </select>
+    <select id="selectFsStoreOrderGroupByDeptId" resultType="com.fs.hisStore.vo.FsStoreOrderCountsVO">
+        SELECT
+        company_dept_id AS id,
+        COALESCE(NULLIF(dept_name, ''),'客户自购') AS name,
+        <include refid="selectFsStoreOrderConditions" />
+        FROM
+        (
+        SELECT so.*,d.dept_id as company_dept_id,d.dept_name,a.audit_status
+        FROM
+        fs_store_order_scrm AS so
+        LEFT JOIN company_user u ON so.company_user_id = u.user_id
+        left join company_dept d ON d.dept_id = u.dept_id
+        left join fs_store_order_audit_scrm a on a.order_id=so.id
+        where 1=1
+        <include refid="selectFsStoreOrderWhere" />
+        <if test="companyId != null  ">
+            AND u.company_id = #{companyId}
+        </if>
+        <if test="orderType != null and orderType != ''">
+            AND so.order_type = #{orderType}
+        </if>
+
+        ) o GROUP BY o.company_dept_id
+    </select>
+
+    <select id="selectFsStoreOrderGroupByUserId" resultType="com.fs.hisStore.vo.FsStoreOrderCountsVO">
+        SELECT
+        company_user_id  AS id,
+        COALESCE(NULLIF(nick_name, ''),'客户自购') AS name,
+
+        <include refid="selectFsStoreOrderConditions" />
+
+        FROM
+        (
+        SELECT so.*,u.nick_name,u.dept_id company_dept_id,a.audit_status
+        FROM
+        fs_store_order_scrm AS so
+        LEFT JOIN company_user u ON so.company_user_id = u.user_id
+        left join fs_store_order_audit_scrm a on a.order_id=so.id
+        where 1=1
+        <include refid="selectFsStoreOrderWhere" />
+        <if test="companyUserId != null  ">
+            AND so.company_user_id = #{companyUserId}
+        </if>
+        <if test="deptId != null">
+            AND u.dept_id  = #{deptId}
+        </if>
+        <if test="companyId != null  ">
+            AND u.company_id = #{companyId}
+        </if>
+
+        ) o GROUP BY o.company_user_id
+    </select>
+
+    <!-- 总金额totalAmount 不包括取消金额和 退款金额 待支付-->
+    <!--  待支付-0 待发货-1 待收货-2 交易完成-3 ;退款中-（-1）; 已退款-（-2） ;已取消- （-3）;  -->
+    <!-- 成单金额 = 总金额  审核通过的，没有审核就是支付成功的 -->
+    <!-- 待审金额 (a.audit_status is null or a.audit_status = 4) null 审核未开启 4 审核成功-->
+    <!--  waitingOrders 待审核  -->
+    <!--  unPassedOrders 审核未过  -->
+    <!--  cancelAmount 取消  -->
+    <!-- unshippedAmount 成交未发货金额  -->
+    <!-- shippedAmount 发货金额 = 总金额   -->
+    <!-- 在途金额  transitAmount 货到付款订单 -->
+  <!--    成交金额=实际支付金额   -->
+    <sql id="selectFsStoreOrderConditions">
+        sum(case when o.status in (1,2,3,-1) and (o.audit_status is null or o.audit_status = 4) then 1 else 0 end) AS totalCalls,
+        sum(case when o.status in (1,2,3,-1) and  (o.audit_status is null or o.audit_status = 4) then o.pay_price else 0 end) AS totalAmount,
+
+        SUM(CASE WHEN o.status IN (1,2,3,-1) and (o.audit_status is null or o.audit_status = 4) THEN o.pay_price ELSE 0 END) AS validAmount,
+
+        COUNT(CASE WHEN o.audit_status in (0,2) THEN 1 END) AS waitingOrders,
+        SUM(CASE WHEN o.audit_status in (0,2) THEN o.pay_price ELSE 0 END) AS waitingAmount,
+
+        COUNT(CASE WHEN o.audit_status in (1,3) THEN 1 END) AS unPassedOrders,
+        SUM(CASE WHEN o.audit_status in (1,3) THEN o.pay_price ELSE 0 END) AS unPassedAmount,
+
+        COUNT(CASE WHEN o.status IN (-3) THEN 1 END) AS cancelOrders,
+        SUM(CASE WHEN o.status IN (-3) THEN o.pay_price ELSE 0 END) AS cancelAmount,
+
+        sum(case when o.pay_type = 1 then
+        case when o.status in (1,2,3,-1) and (o.audit_status is null or o.audit_status = 4) then 1 else 0 end
+        else case when o.status=3 then 1 else 0 end
+        end) AS completeOrders,
+        sum(case when o.pay_type = 1 then
+        case when o.status in (1,2,3,-1) and (o.audit_status is null or o.audit_status = 4) then o.pay_price else 0 end
+        else case when o.status=3 then o.pay_price else 0 end
+        end) AS completeAmount,
+
+        COUNT(CASE WHEN o.status = 1 THEN 1 END) AS unshippedOrders,
+        SUM(CASE WHEN o.status = 1 THEN o.pay_price ELSE 0 END) AS unshippedAmount,
+
+        COUNT(CASE WHEN o.status in (1,2,3,-1) and (o.audit_status is null or o.audit_status = 4) THEN 1 END) AS shippedOrders,
+        SUM(CASE WHEN o.status in (1,2,3,-1) and (o.audit_status is null or o.audit_status = 4) THEN o.pay_price ELSE 0 END) AS shippedAmount,
+
+        COUNT(CASE WHEN o.status = 2 and o.pay_type != 1 THEN 1 END) AS transitOrders,
+        SUM(CASE WHEN o.status = 2 THEN o.pay_delivery ELSE 0 END) AS transitAmount,
+
+        COUNT(CASE WHEN o.status = 3 THEN 1 END) AS receivedOrders,
+        SUM(CASE WHEN o.status = 3 THEN o.pay_price ELSE 0 END) AS receivedAmount,
+
+        COUNT(CASE WHEN o.refund_status = -2 THEN 1 END) AS returnOrders,
+        SUM(CASE WHEN o.refund_status = -2 THEN o.refund_price ELSE 0 END) AS returnAmount,
+
+        COUNT(CASE WHEN o.status = 3 THEN 1 END) AS paybackOrders,
+        SUM(CASE WHEN o.status = 3 THEN o.pay_price ELSE 0 END) AS paybackAmount
+    </sql>
+
+
+    <sql id="selectFsStoreOrderWhere">
+        <choose>
+            <when test="queryType != null and queryType==1">
+                and  (DATE_FORMAT(so.create_time,#{sqlDateFormat}) between #{beginTime} and #{finalTime})
+            </when>
+            <when test="queryType != null and queryType==2">
+                and  (DATE_FORMAT(so.delivery_send_time,#{sqlDateFormat}) between #{beginTime} and #{finalTime})
+            </when>
+        </choose>
+        <choose>
+            <when test="amountType != null and amountType==1">
+                and  so.pay_price=0
+            </when>
+            <when test="amountType != null and amountType==2">
+                and so.pay_price &gt; 0
+            </when>
+        </choose>
+        <if test="orderType != null and orderType != ''">
+            AND so.order_type = #{orderType}
+        </if>
+        <if test="orderMedium != null and orderMedium != ''">
+            AND so.order_medium = #{orderMedium}
+        </if>
+    </sql>
+
+
 </mapper>