Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_java

fs-admin/src/main/java/com/fs/company/controller/CompanyMoneyLogsController.java

@@ -73,6 +73,7 @@ public class CompanyMoneyLogsController extends BaseController
         }
         if(companyMoneyLogs.getLogsType()!=null){
             if(companyMoneyLogs.getLogsType()==3 || companyMoneyLogs.getLogsType()==4 || companyMoneyLogs.getLogsType()==5 || companyMoneyLogs.getLogsType()==6 || companyMoneyLogs.getLogsType()==13|| companyMoneyLogs.getLogsType()==14){
+                // 根据type字段判断，支持商城订单(type=0)和直播订单(type=1)
                 List<CompanyMoneyLogsVO> list = companyMoneyLogsService.selectCompanyMoneyLogsMallVOList(companyMoneyLogs);
                 return getDataTable(list);
             }
@@ -156,7 +157,15 @@ public class CompanyMoneyLogsController extends BaseController
             task.setStatus(0);
             task.setStartTime(new Date());
             task.setSysType(1);
-            task.setRemark("导出商城订单明细");
+            String remark = "导出订单明细";
+            if (param.getOrderType() != null) {
+                if (param.getOrderType() == 0) {
+                    remark = "导出商城订单明细";
+                } else if (param.getOrderType() == 1) {
+                    remark = "导出直播订单明细";
+                }
+            }
+            task.setRemark(remark);
             task.setUserId(SecurityUtils.getUserId());
             exportTaskService.insertFsExportTask(task);
             param.setTaskId(task.getTaskId());

fs-admin/src/main/java/com/fs/his/controller/FsStoreOrderController.java

@@ -42,6 +42,7 @@ import com.fs.his.param.FsStoreOrderSetErpPhoneParam;
 import com.fs.his.service.*;
 import com.fs.his.utils.ConfigUtil;
 import com.fs.his.vo.*;
+import com.fs.hisStore.service.IFsStoreOrderScrmService;
 import com.fs.system.domain.SysConfig;
 import com.fs.system.mapper.SysConfigMapper;
 import com.fs.system.service.ISysRoleService;
@@ -82,6 +83,8 @@ public class FsStoreOrderController extends BaseController
     @Autowired
     private IFsStoreOrderService fsStoreOrderService;
     @Autowired
+    private IFsStoreOrderScrmService fsStoreOrderScrmService;
+    @Autowired
     private IFsExpressService expressService;
     @Autowired
     private ICompanyMoneyLogsService moneyLogsService;
@@ -458,7 +461,7 @@ public class FsStoreOrderController extends BaseController
     @GetMapping("/payment/{orderId}")
     public AjaxResult getPayInfo(@PathVariable("orderId") Long orderId)
     {
-        return AjaxResult.success(fsStoreOrderService.selectFsStorePaymentByOrderId(orderId));
+        return AjaxResult.success(fsStoreOrderScrmService.selectFsStorePaymentByOrderId(orderId));
     }
     /**
      * 获取处方详细信息

fs-company/src/main/java/com/fs/company/controller/company/CompanyMoneyLogsController.java

@@ -126,7 +126,15 @@ public class CompanyMoneyLogsController extends BaseController
             task.setTaskType(7);
             task.setStatus(0);
             task.setStartTime(new Date());
-            task.setRemark("药品订单导出");
+            String remark = "导出订单明细";
+            if (param.getOrderType() != null) {
+                if (param.getOrderType() == 0) {
+                    remark = "导出商城订单明细";
+                } else if (param.getOrderType() == 1) {
+                    remark = "导出直播订单明细";
+                }
+            }
+            task.setRemark(remark);
             task.setSysType(2);
             task.setCompanyUserId(userId);
             exportTaskService.insertFsExportTask(task);

fs-service/src/main/java/com/fs/company/mapper/CompanyMoneyLogsMapper.java

@@ -92,10 +92,15 @@ public interface CompanyMoneyLogsMapper
 
 
     @Select({"<script> " +
-            "select l.*,c.company_name ,o.order_code,o.user_phone,p.bank_transaction_id,p.pay_type_code,p.pay_code " +
+            "select l.*,c.company_name, " +
+            "CASE WHEN l.type = 0 THEN o.order_code WHEN l.type = 1 THEN lo.order_code ELSE NULL END as order_code, " +
+            "CASE WHEN l.type = 0 THEN o.user_name WHEN l.type = 1 THEN lo.user_name ELSE NULL END as real_name, " +
+            "CASE WHEN l.type = 0 THEN o.user_phone WHEN l.type = 1 THEN lo.user_phone ELSE NULL END as user_phone, " +
+            "p.bank_transaction_id,p.pay_type_code,p.pay_code " +
             "from company_money_logs l left join company c on c.company_id=l.company_id   " +
-            "left join fs_store_order o on o.order_id=l.business_id " +
-            "left join fs_store_payment p on (o.order_code=p.business_code and p.`status`=1) "+
+            "left join fs_store_order_scrm o on (o.id=CAST(l.business_id AS UNSIGNED) and l.type=0) " +
+            "left join live_order lo on (lo.order_id=CAST(l.business_id AS UNSIGNED) and l.type=1) " +
+            "left join fs_store_payment_scrm p on (o.order_code=p.business_code and p.`status`=1 and l.type=0) "+
             "where  (l.logs_type=3 || l.logs_type=4 || l.logs_type=5 || l.logs_type=6 || l.logs_type=13 || l.logs_type=14)  " +
             "<if test = 'maps.companyId != null  '> " +
             "and l.company_id = #{maps.companyId}" +
@@ -106,8 +111,11 @@ public interface CompanyMoneyLogsMapper
             "<if test = 'maps.businessId != null  '> " +
             "and l.business_id = #{maps.businessId}" +
             "</if>" +
+            "<if test = 'maps.type != null  '> " +
+            "and l.type = #{maps.type}" +
+            "</if>" +
             "<if test = 'maps.orderCode != null and maps.orderCode != \"\"  '> " +
-            "and o.order_code = #{maps.orderCode}" +
+            "and ((l.type=0 and o.order_code = #{maps.orderCode}) or (l.type=1 and lo.order_code = #{maps.orderCode}))" +
             "</if>" +
             "<if test = 'maps.tradeCode != null and maps.tradeCode != \"\"  '> " +
             "and p.bank_transaction_id = #{maps.tradeCode}" +
@@ -116,7 +124,7 @@ public interface CompanyMoneyLogsMapper
             "and p.pay_code = #{maps.payCode}" +
             "</if>" +
             "<if test = 'maps.userPhone != null and maps.userPhone != \"\"  '> " +
-            "and o.user_phone = #{maps.userPhone}" +
+            "and ((l.type=0 and o.user_phone = #{maps.userPhone}) or (l.type=1 and lo.user_phone = #{maps.userPhone}))" +
             "</if>" +
             "<if test = 'maps.createTimeList != null    '> " +
             " AND date_format(l.create_time,'%y%m%d') &gt;= date_format(#{maps.createTimeList[0]},'%y%m%d') " +
@@ -234,15 +242,36 @@ public interface CompanyMoneyLogsMapper
 //            "order by l.logs_id desc" +
 //            "</script>"})
     @Select({"<script> " +
-            "select l.*,o.*,c.company_name,cd.dept_name,cu.nick_name as company_user_name  FROM company_money_logs l " +
-            " LEFT JOIN fs_store_order_scrm o ON o.id=l.business_id and o.company_id =l.company_id  " +
-            " LEFT JOIN company c ON c.company_id= l.company_id " +
-            " LEFT JOIN company_user cu ON cu.user_id=o.company_user_id " +
-            " LEFT JOIN company_dept cd ON cd.dept_id=cu.dept_id   " +
-            " where (l.logs_type=3||l.logs_type=4||l.logs_type=5||l.logs_type=6 ||  l.logs_type=13 ||  l.logs_type=14)" +
+            "select l.*,c.company_name,cd.dept_name,cu.nick_name as company_user_name, " +
+            "CASE WHEN l.type = 0 THEN o.order_code WHEN l.type = 1 THEN lo.order_code ELSE NULL END as order_code, " +
+            "CASE WHEN l.type = 0 THEN o.real_name WHEN l.type = 1 THEN lo.user_name ELSE NULL END as user_name, " +
+            "CASE WHEN l.type = 0 THEN o.user_phone WHEN l.type = 1 THEN lo.user_phone ELSE NULL END as user_phone, " +
+            "CASE WHEN l.type = 0 THEN o.user_address WHEN l.type = 1 THEN lo.user_address ELSE NULL END as user_address, " +
+            "CASE WHEN l.type = 0 THEN o.total_price WHEN l.type = 1 THEN lo.total_price ELSE NULL END as total_price, " +
+            "CASE WHEN l.type = 0 THEN o.pay_money WHEN l.type = 1 THEN lo.pay_money ELSE NULL END as pay_money, " +
+            "CASE WHEN l.type = 0 THEN o.pay_delivery WHEN l.type = 1 THEN lo.pay_delivery ELSE NULL END as pay_delivery, " +
+            "CASE WHEN l.type = 0 THEN CAST(o.status AS CHAR) WHEN l.type = 1 THEN CAST(lo.status AS CHAR) ELSE NULL END as status, " +
+            "CASE WHEN l.type = 0 THEN o.delivery_sn WHEN l.type = 1 THEN lo.delivery_sn ELSE NULL END as delivery_sn, " +
+            "CASE WHEN l.type = 0 THEN CAST(o.delivery_pay_status AS CHAR) WHEN l.type = 1 THEN CAST(lo.delivery_pay_status AS CHAR) ELSE NULL END as delivery_pay_status, " +
+            "CASE WHEN l.type = 0 THEN o.delivery_time WHEN l.type = 1 THEN lo.delivery_time ELSE NULL END as delivery_time, " +
+            "CASE WHEN l.type = 0 THEN o.delivery_pay_time WHEN l.type = 1 THEN lo.delivery_pay_time ELSE NULL END as delivery_pay_time, " +
+            "CASE WHEN l.type = 0 THEN null WHEN l.type = 1 THEN NULL ELSE NULL END as package_name, " +
+            "CASE WHEN l.type = 0 THEN null WHEN l.type = 1 THEN NULL ELSE NULL END as package_second_name, " +
+            "CASE WHEN l.type = 0 THEN null WHEN l.type = 1 THEN lo.pay_type ELSE NULL END as pay_type " +
+            "FROM company_money_logs l " +
+            "LEFT JOIN fs_store_order_scrm o ON (o.id=CAST(l.business_id AS UNSIGNED) and o.company_id=l.company_id and l.type=0) " +
+            "LEFT JOIN live_order lo ON (lo.order_id=CAST(l.business_id AS UNSIGNED) and lo.company_id=l.company_id and l.type=1) " +
+            "LEFT JOIN company c ON c.company_id= l.company_id " +
+            "LEFT JOIN company_user cu ON (cu.user_id=CASE WHEN l.type=0 THEN o.company_user_id WHEN l.type=1 THEN lo.company_user_id ELSE NULL END) " +
+            "LEFT JOIN company_dept cd ON cd.dept_id=cu.dept_id   " +
+            "LEFT JOIN fs_store_payment_scrm p ON (p.business_code=o.order_code and p.status=1 and l.type=0) " +
+            "where (l.logs_type=3||l.logs_type=4||l.logs_type=5||l.logs_type=6 ||  l.logs_type=13 ||  l.logs_type=14)" +
             "<if test = 'maps.companyId != null  '> " +
             "and l.company_id = #{maps.companyId}" +
             "</if>" +
+            "<if test = 'maps.orderType != null  '> " +
+            "and l.type = #{maps.orderType}" +
+            "</if>" +
             "<if test = 'maps.createTimeList != null    '> " +
             " AND date_format(l.create_time,'%y%m%d') &gt;= date_format(#{maps.createTimeList[0]},'%y%m%d') " +
             " AND date_format(l.create_time,'%y%m%d') &lt;= date_format(#{maps.createTimeList[1]},'%y%m%d') " +
@@ -335,6 +364,9 @@ public interface CompanyMoneyLogsMapper
             "<if test = 'maps.companyId != null  '> " +
             "and l.company_id = #{maps.companyId}" +
             "</if>" +
+            "<if test = 'maps.orderType != null  '> " +
+            "and l.type = #{maps.orderType}" +
+            "</if>" +
             "<if test = 'maps.createTimeList != null    '> " +
             " AND date_format(l.create_time,'%y%m%d') &gt;= date_format(#{maps.createTimeList[0]},'%y%m%d') " +
             " AND date_format(l.create_time,'%y%m%d') &lt;= date_format(#{maps.createTimeList[1]},'%y%m%d') " +

fs-service/src/main/java/com/fs/company/service/impl/CompanyMoneyLogsServiceImpl.java

@@ -238,8 +238,16 @@ public class CompanyMoneyLogsServiceImpl implements ICompanyMoneyLogsService
                     }
                 }
             }
+            String fileName = "订单明细";
+            if (param.getOrderType() != null) {
+                if (param.getOrderType() == 0) {
+                    fileName = "商城订单明细";
+                } else if (param.getOrderType() == 1) {
+                    fileName = "直播订单明细";
+                }
+            }
             ExcelUtil<CompanyMoneyLogsExport1VO> util = new ExcelUtil<CompanyMoneyLogsExport1VO>(CompanyMoneyLogsExport1VO.class);
-            AjaxResult result =  util.exportExcel(list, "商城订单");
+            AjaxResult result =  util.exportExcel(list, fileName);
             FsExportTask task=fsExportTaskMapper.selectFsExportTaskByTaskId(param.getTaskId());
             task.setFinishTime(new Date());
             task.setStatus(1);

fs-service/src/main/java/com/fs/company/vo/CompanyMoneyLogsVO.java

@@ -68,5 +68,5 @@ public class CompanyMoneyLogsVO implements Serializable
 
     //支付类型
     private String payTypeCode;
-
+    private int type;
 }

fs-service/src/main/java/com/fs/his/mapper/FsStoreOrderMapper.java

@@ -367,7 +367,7 @@ public interface FsStoreOrderMapper
 
     @Select("select so.*,st.store_name,us.nick_name,us.phone,p.patient_age,p.patient_gender,p.patient_descs,p.patient_name," +
             "d.doctor_name,fp.prescribe_code,fd.doctor_name follow_doctor_name,c.company_name,cu.user_name company_user_name,pat.relation  " +
-            "FROM fs_store_order so LEFT JOIN fs_store st ON so.store_id =st.store_id " +
+            "FROM fs_store_order_scrm so LEFT JOIN fs_store_scrm st ON so.store_id =st.store_id " +
             "LEFT JOIN fs_user us ON us.user_id=so.user_id " +
             "LEFT JOIN fs_prescribe p ON p.prescribe_id =so.prescribe_id " +
             "LEFT JOIN fs_doctor d ON p.doctor_id= d.doctor_id " +
@@ -375,7 +375,7 @@ public interface FsStoreOrderMapper
             "LEFT JOIN company c on c.company_id =so.company_id " +
             "LEFT JOIN company_user cu on cu.user_id=so.company_user_id " +
             "LEFT JOIN fs_doctor fd on so.follow_doctor_id =fd.doctor_id " +
-            "LEFT JOIN fs_patient pat ON pat.patient_id=p.patient_id  WHERE so.is_del=0  and so.order_id= #{orderId}")
+            "LEFT JOIN fs_patient pat ON pat.patient_id=p.patient_id  WHERE so.is_del=0  and so.id= #{orderId}")
     FsStoreOrderVO selectFsStoreOrderByOrderIdVO(@Param("orderId") Long orderId);
 
     @Update("update fs_store_order set status=-3 where order_id=#{orderId}")

fs-service/src/main/java/com/fs/his/param/FsCompanyMoneyLogsExportParam.java

@@ -10,6 +10,7 @@ public class FsCompanyMoneyLogsExportParam  implements Serializable {
     private Long companyId;
     private Integer logsType;
     private Integer type;//0 全部 1明细
+    private Integer orderType;//订单类型：0=商城订单 1=直播订单 null=全部
     private Long taskId;//任务ID
     private String createTimeRange;
 

fs-service/src/main/resources/application-config-druid-bjzm-test.yml

@@ -15,8 +15,8 @@ logging:
 wx:
   miniapp:
     configs:
-      - appid: wxe67df00c8a1e6bed   #北京卓美
-        secret: 7ded976d7aa1901cf5e73e8da70fb37d #北京卓美
+      - appid: wx30d1ed5dbbdc5cc5   #乐享优品百域臻品
+        secret: 63624481b94437ecbd3ce34c19543746 #北京卓美
         token: cbnd7lJvkripVOpyTFAna6NAWCxCrvC
         aesKey: HlEiBB55eaWUaeBVAQO3cWKWPYv1vOVQSq7nFNICw4E
         msgDataFormat: JSON

fs-service/src/main/resources/application-config-druid-bjzm.yml

@@ -10,8 +10,8 @@ logging:
 wx:
   miniapp:
     configs:
-      - appid: wxe67df00c8a1e6bed   #北京卓美
-        secret: 7ded976d7aa1901cf5e73e8da70fb37d #北京卓美
+      - appid: wx30d1ed5dbbdc5cc5   #乐享优品百域臻品
+        secret: 63624481b94437ecbd3ce34c19543746 #北京卓美
         token: cbnd7lJvkripVOpyTFAna6NAWCxCrvC
         aesKey: HlEiBB55eaWUaeBVAQO3cWKWPYv1vOVQSq7nFNICw4E
         msgDataFormat: JSON