Merge remote-tracking branch 'origin/ScrmStore'

# Conflicts:
#	fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreOrderScrmMapper.java
#	fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

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

@@ -184,7 +184,7 @@ public class FsStoreHealthOrderScrmController extends BaseController {
     //订单发货批量导入
     @Log(title = "发货同步导入", businessType = BusinessType.IMPORT)
     @PostMapping("/importDeliveryNoteExpress")
-    public R importDeliveryNoteExpress(@RequestParam("file") MultipartFile file, @RequestParam("miniAppId") String miniAppId) {
+    public R importDeliveryNoteExpress(@RequestParam("file") MultipartFile file) {
         // 1. 检查文件是否为空
         if (file.isEmpty()) {
             return R.error("上传的文件不能为空");
@@ -203,7 +203,7 @@ public class FsStoreHealthOrderScrmController extends BaseController {
         try {
             List<FsOrderDeliveryNoteDTO> dtoList = util.importExcel(file.getInputStream());
             if(!dtoList.isEmpty()){
-                fsStoreOrderService.importDeliveryNoteExpress(dtoList,miniAppId);
+                fsStoreOrderService.importDeliveryNoteExpress(dtoList);
             }else {
                 R.error("操作失败，导入数据不能小于1条！");
             }

fs-service/src/main/java/com/fs/course/dto/FsOrderDeliveryNoteDTO.java

@@ -17,6 +17,6 @@ public class FsOrderDeliveryNoteDTO {
     /**
      * 发货状态
      * **/
-    @Excel(name = "系统订单号(2 待收货 3 交易完成)填写对应数字",width = 50,sort = 2)
+    @Excel(name = "系统订单号(1：待发货、2：待收货、3：交易完成,-3：已取消)填写对应数字",width = 90,sort = 2)
     private Integer deliveryNoteStatus;
 }

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

@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONObject;
 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;
@@ -1060,6 +1061,12 @@ public interface FsStoreOrderScrmMapper
 
     List<Map<String, Object>> selectFsStoreProductCountsByDept(Map<String, Object> map);
 
+    /**
+     * 批量更新订单状态
+     * @param dtoList 订单更新数据表
+     * **/
+    void batchUpdateInOrderCode(@Param("dtoList") List<FsOrderDeliveryNoteDTO> dtoList);
+
     @Select({"<script> " +
             "select so.*,st.store_name,us.nick_name,us.phone,d.doctor_name,p.patient_name,p.prescribe_code,c.company_name,cu.nick_name company_user_name,cts.name as schedule_name,po.product_cost_price total_cost_money,po.inquiry_cost_price inquiry_money,po.total_cost_price,po.cost_discount_money inquiryDiscountMoney, total_money,p.diagnose " +
             " FROM fs_store_order_scrm so LEFT JOIN fs_store_scrm st ON so.store_id =st.store_id " +

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

@@ -176,7 +176,7 @@ public interface FsStoreProductScrmMapper
     List<FsStoreProductListQueryVO> selectFsStoreProductHotQuery(int count);
     @Select("select * from fs_store_product_scrm where is_del=0 and is_show=1 and  is_good=1 and is_display=1 order by sort desc limit #{count}")
     List<FsStoreProductListQueryVO> selectFsStoreProductGoodQuery(int count);
-    @Select("select * from fs_store_product_scrm where is_del=0 and is_show=1 and  is_best=1 and is_display=1 order by sort desc")
+    @Select("select * from fs_store_product_scrm where is_del=0 and is_show=1 and  is_best=1 and is_display=1 order by sort desc,product_id desc")
     List<FsStoreProductListQueryVO> selectFsStoreProductTuiListQuery();
     @Select("select * from fs_store_product_scrm where is_del=0 and is_show=1 and  is_good=1 and is_display=1 order by sort desc")
     List<FsStoreProductListQueryVO> selectFsStoreProductGoodListQuery();

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

@@ -280,7 +280,6 @@ public interface IFsStoreOrderScrmService
     /**
      * 批量导入更新微信订单发货状态
      * @param dtoList 订单数据
-     * @param miniAppId 小程序Id
      * **/
-    void importDeliveryNoteExpress(List<FsOrderDeliveryNoteDTO> dtoList,String miniAppId);
+    void importDeliveryNoteExpress(List<FsOrderDeliveryNoteDTO> dtoList);
 }

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -3595,12 +3595,10 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService
     }
 
     @Override
-    public void importDeliveryNoteExpress(List<FsOrderDeliveryNoteDTO> dtoList, String miniAppId) {
+    public void importDeliveryNoteExpress(List<FsOrderDeliveryNoteDTO> dtoList) {
        try {
-           //获取微信token逻辑
-           final WxMaService wxService = WxMaConfiguration.getMaService(miniAppId);
-           String token = wxService.getAccessToken();
-           System.out.println("获取到的token------------->:"+token);
+           //批量更新订单状态
+           fsStoreOrderMapper.batchUpdateInOrderCode(dtoList);
        }catch (Exception e){
            e.getStackTrace();
        }

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

@@ -879,4 +879,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY t.order_type
         HAVING t.order_type > 0
     </select>
+
+    <update id="batchUpdateInOrderCode">
+        UPDATE fs_store_order_scrm
+        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="dtoList" item="item" open="(" separator="," close=")">
+            #{item.orderNumber}
+        </foreach>
+    </update>
 </mapper>