1.订单发货时间 2.用户信息采集医生确认时间

fs-service/src/main/java/com/fs/erp/domain/ErpDeliverys.java

@@ -3,6 +3,8 @@ package com.fs.erp.domain;
 import com.fs.erp.dto.df.DFDeliveryResponse;
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class ErpDeliverys extends DFDeliveryResponse {
 
@@ -13,6 +15,7 @@ public class ErpDeliverys extends DFDeliveryResponse {
     String code;
     String warehouse_name;
     String warehouse_code;
+    String send_date;
 
 
 }

fs-service/src/main/java/com/fs/erp/service/impl/JSTErpOrderServiceImpl.java

@@ -479,6 +479,8 @@ public class JSTErpOrderServiceImpl implements IErpOrderService {
             delivery.setExpress_name(order.getLogisticsCompany());
             delivery.setDelivery(true);
             delivery.setCode(order.getSoId());
+            //发货日期
+            delivery.setSend_date(order.getSendDate());
 
             deliverysList.add(delivery);
             erpOrder.setDeliverys(deliverysList);
@@ -557,6 +559,8 @@ public class JSTErpOrderServiceImpl implements IErpOrderService {
             delivery.setExpress_name(order.getLogisticsCompany());
             delivery.setDelivery(true);
             delivery.setCode(order.getSoId());
+            //发货日期
+            delivery.setSend_date(order.getSendDate());
 
             deliverysList.add(delivery);
             erpOrder.setDeliverys(deliverysList);

fs-service/src/main/java/com/fs/his/service/IFsStoreOrderService.java

@@ -2,6 +2,7 @@ package com.fs.his.service;
 
 import java.math.BigDecimal;
 import java.text.ParseException;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -143,7 +144,7 @@ public interface IFsStoreOrderService
     Long selectFsStoreOrderTotalCount(int i, Long companyId);
 
 
-    void deliveryOrder(String orderCode, String mailNo, String expressCode, String expressName);
+    void deliveryOrder(String orderCode, String mailNo, String expressCode, String expressName, String sendDate);
 
     int afterSales(FsStoreOrderSalesParam fsStoreOrder);
 
@@ -265,7 +266,7 @@ public interface IFsStoreOrderService
 
     String selectFsStoreOrderProductStatistics(FsStoreOrderParam fsStoreOrder);
 
-    void deliveryOrderScrm(String orderCode, String mailNo, String expressCode, String expressName);
+    void deliveryOrderScrm(String orderCode, String mailNo, String expressCode, String expressName,String sendDate);
 
     FsStoreOrderScrm selectFsStoreOrderScrmByOrderCode(String soId);
 

fs-service/src/main/java/com/fs/his/service/impl/FsStoreOrderServiceImpl.java

@@ -1780,7 +1780,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
     }
 
     @Override
-    public void deliveryOrder(String orderCode, String deliveryId, String deliverCode, String deliverName) {
+    public void deliveryOrder(String orderCode, String deliveryId, String deliverCode, String deliverName,String sendDate) {
         FsStoreOrder order = fsStoreOrderMapper.selectFsStoreOrderByOrderCode(orderCode);
         if (order != null && order.getStatus() == 2) {
             FsExpress express = expressService.selectFsExpressByOmsCode(deliverCode);
@@ -1826,7 +1826,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
     @Autowired
     IFsStoreOrderLogsScrmService iFsStoreOrderLogsScrmService;
     @Override
-    public void deliveryOrderScrm(String orderCode, String deliveryId, String deliverCode, String deliverName) {
+    public void deliveryOrderScrm(String orderCode, String deliveryId, String deliverCode, String deliverName,String sendDate) {
         FsStoreOrderScrm order = fsStoreOrderMapper.selectFsStoreOrderScrmByOrderCode(orderCode);
         if (order != null && order.getStatus() == 1) {
             FsExpress express = expressService.selectFsExpressByOmsCode(deliverCode);
@@ -1839,6 +1839,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
                 order.setDeliverySn("SF");
             }
             order.setStatus(2);
+            order.setDeliveryTime(sendDate);
             order.setDeliveryId(deliveryId);
             order.setDeliverySendTime(DateUtils.getNowDate());
             storeOrderScrmMapper.updateFsStoreOrder(order);
@@ -2720,7 +2721,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
                             for (ErpDeliverys delivery : orderQuery.getDeliverys()) {
                                 if (delivery.getDelivery() && org.apache.commons.lang3.StringUtils.isNotEmpty(delivery.getMail_no())) {
                                     //更新商订单状态 删除REDIS
-                                    fsStoreOrderService.deliveryOrder(order.getOrderCode(), delivery.getMail_no(), delivery.getExpress_code(), delivery.getExpress_name());
+                                    fsStoreOrderService.deliveryOrder(order.getOrderCode(), delivery.getMail_no(), delivery.getExpress_code(), delivery.getExpress_name(),delivery.getSend_date());
                                     redisCache.deleteObject("delivery" + ":" + order.getExtendOrderId());
                                 }
                             }

fs-service/src/main/java/com/fs/his/vo/FsStoreOrderListVO.java

@@ -66,4 +66,8 @@ public class FsStoreOrderListVO {
 
     //erp推送账号
     private String erpAccount;
+
+    //发货时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date deliverySendTime;
 }

fs-service/src/main/java/com/fs/hisStore/domain/FsUserInformationCollection.java

@@ -1,12 +1,14 @@
 package com.fs.hisStore.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fs.common.annotation.Excel;
 import lombok.Data;
 import com.fs.common.core.domain.BaseEntity;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 用户信息采集对象 fs_user_information_collection
@@ -74,4 +76,8 @@ public class FsUserInformationCollection extends BaseEntity{
     //确认状态 1第一次确认 2第二次确认
     private Integer status;
 
+    //医生确认时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date doctorConfirmTime;
+
 }

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

@@ -322,6 +322,8 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
         FsUserInformationCollection map = new FsUserInformationCollection();
         map.setId(collection.getId());
         map.setDoctorAdvice(collection.getDoctorAdvice());
+        //医生确认时间
+        map.setDoctorConfirmTime(DateUtils.getNowDate());
         if (answerVOS != null && !answerVOS.isEmpty()) {
             map.setJsonInfo(JSON.toJSONString(answerVOS));
         }

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

@@ -244,5 +244,9 @@ public class FsStoreOrderVO implements Serializable
 
     private String orderMedium;
 
+    //发货时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date deliverySendTime;
+
 
 }

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

@@ -24,10 +24,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status"    column="status"    />
         <result property="userAdvice"    column="user_advice"    />
         <result property="doctorAdvice"    column="doctor_advice"    />
+        <result property="doctorConfirmTime"    column="doctor_confirm_time"    />
     </resultMap>
 
     <sql id="selectFsUserInformationCollectionVo">
-        select id, question_id, user_id, json_info, user_confirm, doctor_confirm, create_time, update_time,doctor_id,company_user_id,package_id,pay_type,amount,is_package,user_confirm2,package_order_code,status,user_advice,doctor_advice from fs_user_information_collection
+        select id, question_id, user_id, json_info, user_confirm, doctor_confirm, create_time, update_time,doctor_id,company_user_id,package_id,pay_type,amount,is_package,user_confirm2,package_order_code,status,user_advice,doctor_advice,doctor_confirm_time from fs_user_information_collection
     </sql>
 
     <select id="selectFsUserInformationCollectionList" parameterType="FsUserInformationCollection" resultMap="FsUserInformationCollectionResult">
@@ -82,6 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userConfirm2 != null">user_confirm2,</if>
             <if test="packageOrderCode != null">package_order_code,</if>
             <if test="status != null">status,</if>
+            <if test="doctorConfirmTime != null">doctor_confirm_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="questionId != null">#{questionId},</if>
@@ -102,6 +104,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userConfirm2 != null">#{userConfirm2},</if>
             <if test="packageOrderCode != null">#{packageOrderCode},</if>
             <if test="status != null">#{status},</if>
+            <if test="status != null">#{status},</if>
+            <if test="doctorConfirmTime != null">#{doctorConfirmTime},</if>
          </trim>
     </insert>
 
@@ -126,6 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isPackage != null">is_package = #{isPackage},</if>
             <if test="packageOrderCode != null">package_order_code = #{packageOrderCode},</if>
             <if test="status != null">status = #{status},</if>
+            <if test="doctorConfirmTime != null">doctorConfirmTime = #{doctor_confirm_time},</if>
         </trim>
         where id = #{id}
     </update>