外部订单财务审核搜索改造

fs-company/src/main/java/com/fs/company/controller/store/FsExternalOrderController.java

@@ -18,6 +18,7 @@ import com.fs.his.param.FsExternalOrderAddParam;
 import com.fs.his.param.FsOrderFinanceAuditApplyParam;
 import com.fs.his.service.IFsExternalOrderService;
 import com.fs.his.service.IFsStoreOrderService;
+import com.fs.his.utils.PhoneUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -46,6 +47,10 @@ public class FsExternalOrderController extends BaseController {
         startPage();
         LoginUser loginUser = SecurityUtils.getLoginUser();
         fsExternalOrder.setCompanyId(loginUser.getCompany().getCompanyId());
+        // 会员电话需要加密后和数据库匹配
+        if (fsExternalOrder.getMemberPhone() != null && !fsExternalOrder.getMemberPhone().isEmpty()) {
+            fsExternalOrder.setMemberPhone(PhoneUtil.encryptPhone(fsExternalOrder.getMemberPhone()));
+        }
         List<FsExternalOrderListVO> list = fsExternalOrderService.selectExternalOrderListVO(fsExternalOrder);
         return getDataTable(list);
     }

fs-company/src/main/java/com/fs/company/controller/store/FsStoreOrderController.java

@@ -319,6 +319,23 @@ public class FsStoreOrderController extends BaseController
         return toAjax(fsStoreOrderService.updateFsStoreOrder(fsStoreOrder));
     }
 
+    /**
+     * 订单修改（销售端弹窗，与外部订单一致：签收状态变更时记录更新人和时间）
+     */
+    @Log(title = "订单修改", businessType = BusinessType.UPDATE)
+    @PreAuthorize("@ss.hasPermi('store:storeOrder:edit')")
+    @PostMapping("/edit")
+    public AjaxResult editOrder(@RequestBody FsStoreOrder fsStoreOrder) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        fsStoreOrder.setUpdateBy(loginUser.getUser().getUserName());
+        // 签收状态变更时，写入签收状态更新人和时间
+        if (fsStoreOrder.getDeliveryStatus() != null) {
+            fsStoreOrder.setDeliveryStatusUpdateTime(new Date());
+            fsStoreOrder.setDeliveryStatusUpdateBy(loginUser.getUser().getUserName());
+        }
+        return toAjax(fsStoreOrderService.updateFsStoreOrder(fsStoreOrder));
+    }
+
     /**
      * 修改订单
      */

fs-service/src/main/java/com/fs/his/domain/FsExternalOrder.java

@@ -175,19 +175,117 @@ public class FsExternalOrder extends BaseEntity
     @TableField(exist = false)
     private String returnStatus;
 
-    /** 发货开始时间 */
+    /** 产品名筛选 */
     @TableField(exist = false)
-    private String deliveryStartTime;
+    private String productName;
+
+    /** 部门id筛选 */
+    @TableField(exist = false)
+    private Long deptId;
+
+    // ========== 搜索条件（非数据库字段） ==========
+
+    /** 销售姓名 */
+    @TableField(exist = false)
+    private String companyUserName;
+
+    /** 会员手机号 */
+    @TableField(exist = false)
+    private String memberPhone;
+
+    /** 会员姓名 */
+    @TableField(exist = false)
+    private String memberName;
+
+    /** 会员性别 */
+    @TableField(exist = false)
+    private Integer memberSex;
+
+    /** 会员年龄 */
+    @TableField(exist = false)
+    private Integer memberAge;
+
+    /** 地址 */
+    @TableField(exist = false)
+    private String address;
+
+    /** 省市 */
+    @TableField(exist = false)
+    private String province;
 
-    /** 发货结束时间 */
+    /** 二级市 */
+    @TableField(exist = false)
+    private String city;
+
+    /** 区县 */
+    @TableField(exist = false)
+    private String district;
+
+    /** 乡镇 */
+    @TableField(exist = false)
+    private String township;
+
+    /** 复购次数-最小值 */
+    @TableField(exist = false)
+    private Integer memberBuyCountMin;
+
+
+
+    // 时间范围搜索
+    @TableField(exist = false)
+    private String deliveryStartTime;
     @TableField(exist = false)
     private String deliveryEndTime;
+    @TableField(exist = false)
+    private String depositReturnTimeStart;
+    @TableField(exist = false)
+    private String depositReturnTimeEnd;
+    @TableField(exist = false)
+    private String followTimeStart;
+    @TableField(exist = false)
+    private String followTimeEnd;
+    @TableField(exist = false)
+    private String refundTimeStart;
+    @TableField(exist = false)
+    private String refundTimeEnd;
+    @TableField(exist = false)
+    private String auditTimeStart;
+    @TableField(exist = false)
+    private String auditTimeEnd;
 
-    /** 产品名筛选 */
+    /** 回款人 (搜索条件) */
     @TableField(exist = false)
-    private String productName;
+    private String returnUser;
 
-    /** 部门id筛选 */
+    /** 回款日期开始 (搜索条件) */
     @TableField(exist = false)
-    private Long deptId;
+    private String returnTimeStart;
+
+    /** 回款日期结束 (搜索条件) */
+    @TableField(exist = false)
+    private String returnTimeEnd;
+    
+    /** 拒收退回日期开始 (搜索条件) */
+    @TableField(exist = false)
+    private String rejectReturnTimeStart;
+
+    /** 拒收退回日期结束 (搜索条件) */
+    @TableField(exist = false)
+    private String rejectReturnTimeEnd;
+
+    /** 发货数量 */
+    @TableField(exist = false)
+    private Long deliveryCount;
+
+    /** 发货金额 */
+    @TableField(exist = false)
+    private BigDecimal deliveryAmount;
+
+    /** 签收数量 */
+    @TableField(exist = false)
+    private Long signCount;
+
+    /** 签收金额 */
+    @TableField(exist = false)
+    private BigDecimal signAmount;
 }

fs-service/src/main/java/com/fs/his/domain/FsStoreOrder.java

@@ -267,4 +267,41 @@ public class FsStoreOrder extends BaseEntity
     private String erpPhone;
     private Integer doctorType2Confirm;
 
+    /** 定金回款时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date depositReturnTime;
+
+    /** 代收金额 */
+    private BigDecimal collectionPrice;
+
+    /** 退款金额 */
+    private BigDecimal refundPrice;
+
+    /** 审核人 */
+    private String auditor;
+
+    /** 审核时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date auditTime;
+
+    /** 病名 */
+    private String diseaseName;
+
+    /** 回款金额 */
+    private BigDecimal returnPrice;
+
+    /** 签收状态更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date deliveryStatusUpdateTime;
+
+    /** 签收状态更新人 */
+    private String deliveryStatusUpdateBy;
+
+    /** 拒收回退时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date rejectReturnTime;
+
+    /** 是否还货 1=是,2=否 */
+    private Integer isReturnGoods;
+
 }

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

@@ -258,4 +258,34 @@ public class FsStoreOrderVO implements Serializable {
 
     private String qwSubject;
     private String source;
+
+    /** 定金回款时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date depositReturnTime;
+
+    /** 代收金额 */
+    private BigDecimal collectionPrice;
+
+    /** 退款金额 */
+    private BigDecimal refundPrice;
+
+    /** 病名 */
+    private String diseaseName;
+
+    /** 回款金额 */
+    private BigDecimal returnPrice;
+
+    /** 签收状态更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date deliveryStatusUpdateTime;
+
+    /** 签收状态更新人 */
+    private String deliveryStatusUpdateBy;
+
+    /** 拒收回退时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date rejectReturnTime;
+
+    /** 是否还货 1=是,2=否 */
+    private Integer isReturnGoods;
 }

fs-service/src/main/resources/mapper/his/FsExternalOrderMapper.xml

@@ -344,15 +344,51 @@
         <where>
             <if test="orderCode != null and orderCode != ''"> AND o.order_code = #{orderCode}</if>
             <if test="userId != null"> AND o.user_id = #{userId}</if>
+            <if test="companyUserId != null"> AND o.company_user_id = #{companyUserId}</if>
+            <if test="companyUserName != null and companyUserName != ''"> AND cu.user_name LIKE CONCAT('%', #{companyUserName}, '%')</if>
+            <if test="deptId != null"> AND cu.dept_id = #{deptId}</if>
             <if test="userName != null and userName != ''"> AND o.user_name LIKE CONCAT('%', #{userName}, '%')</if>
             <if test="userPhone != null and userPhone != ''"> AND o.user_phone = #{userPhone}</if>
+            <if test="memberPhone != null and memberPhone != ''"> AND u.phone = #{memberPhone}</if>
+            <if test="memberName != null and memberName != ''"> AND u.nick_name LIKE CONCAT('%', #{memberName}, '%')</if>
+            <if test="memberSex != null"> AND u.sex = #{memberSex}</if>
+            <if test="memberAge != null"> AND TIMESTAMPDIFF(YEAR, FROM_UNIXTIME(u.birthday), CURDATE()) = #{memberAge}</if>
             <if test="isPay != null"> AND o.is_pay = #{isPay}</if>
             <if test="status != null"> AND o.status = #{status}</if>
+            <if test="deliveryStatus != null"> AND o.delivery_status = #{deliveryStatus}</if>
             <if test="companyId != null"> AND o.company_id = #{companyId}</if>
-            <if test="companyUserId != null"> AND o.company_user_id = #{companyUserId}</if>
             <if test="isSync != null"> AND o.is_sync = #{isSync}</if>
             <if test="sTime != null and sTime != ''"> AND o.external_create_time &gt;= #{sTime}</if>
             <if test="eTime != null and eTime != ''"> AND o.external_create_time &lt;= CONCAT(#{eTime},' 23:59:59')</if>
+            <if test="address != null and address != ''"> AND (ua.province LIKE CONCAT('%', #{address}, '%') OR ua.city LIKE CONCAT('%', #{address}, '%') OR ua.district LIKE CONCAT('%', #{address}, '%') OR ua.detail LIKE CONCAT('%', #{address}, '%'))</if>
+            <if test="province != null and province != ''"> AND ua.province = #{province}</if>
+            <if test="city != null and city != ''"> AND ua.city = #{city}</if>
+            <if test="district != null and district != ''"> AND ua.district = #{district}</if>
+            <if test="township != null and township != ''"> AND ua.town_ship = #{township}</if>
+            <if test="productName != null and productName != ''"> AND oi.product_name LIKE CONCAT('%', #{productName}, '%')</if>
+            <if test="payPrice != null"> AND o.pay_price = #{payPrice}</if>
+            <if test="totalPrice != null"> AND o.total_price = #{totalPrice}</if>
+            <if test="collectionPrice != null"> AND o.collection_price = #{collectionPrice}</if>
+            <if test="refundPrice != null"> AND o.refund_price = #{refundPrice}</if>
+            <if test="remark != null and remark != ''"> AND o.remark LIKE CONCAT('%', #{remark}, '%')</if>
+            <if test="deliverySn != null and deliverySn != ''"> AND o.delivery_sn = #{deliverySn}</if>
+            <if test="deliveryCode != null and deliveryCode != ''"> AND o.delivery_code = #{deliveryCode}</if>
+            <if test="deliveryName != null and deliveryName != ''"> AND o.delivery_name LIKE CONCAT('%', #{deliveryName}, '%')</if>
+            <if test="deliveryStartTime != null and deliveryStartTime != ''"> AND o.delivery_time &gt;= #{deliveryStartTime}</if>
+            <if test="deliveryEndTime != null and deliveryEndTime != ''"> AND o.delivery_time &lt;= CONCAT(#{deliveryEndTime},' 23:59:59')</if>
+            <if test="depositReturnTimeStart != null and depositReturnTimeStart != ''"> AND o.update_time &gt;= #{depositReturnTimeStart}</if>
+            <if test="depositReturnTimeEnd != null and depositReturnTimeEnd != ''"> AND o.update_time &lt;= CONCAT(#{depositReturnTimeEnd},' 23:59:59')</if>
+            <if test="followTimeStart != null and followTimeStart != ''"> AND o.follow_time &gt;= #{followTimeStart}</if>
+            <if test="followTimeEnd != null and followTimeEnd != ''"> AND o.follow_time &lt;= CONCAT(#{followTimeEnd},' 23:59:59')</if>
+            <if test="refundTimeStart != null and refundTimeStart != ''"> AND o.refund_time &gt;= #{refundTimeStart}</if>
+            <if test="refundTimeEnd != null and refundTimeEnd != ''"> AND o.refund_time &lt;= CONCAT(#{refundTimeEnd},' 23:59:59')</if>
+            <if test="auditor != null and auditor != ''"> AND o.auditor LIKE CONCAT('%', #{auditor}, '%')</if>
+            <if test="auditTimeStart != null and auditTimeStart != ''"> AND o.audit_time &gt;= #{auditTimeStart}</if>
+            <if test="auditTimeEnd != null and auditTimeEnd != ''"> AND o.audit_time &lt;= CONCAT(#{auditTimeEnd},' 23:59:59')</if>
+            <if test="diseaseName != null and diseaseName != ''"> AND o.disease_name LIKE CONCAT('%', #{diseaseName}, '%')</if>
+            <if test="memberBuyCountMin != null">
+                AND (SELECT COUNT(DISTINCT o2.order_id) FROM fs_external_order o2 WHERE o2.user_id = o.user_id AND o2.company_id = o.company_id AND o2.status != -3) &gt;= #{memberBuyCountMin}
+            </if>
             ${params.dataScope}
         </where>
         GROUP BY o.order_id
@@ -470,17 +506,34 @@
         <where>
             <if test="orderCode != null and orderCode != ''"> AND o.order_code = #{orderCode}</if>
             <if test="userName != null and userName != ''"> AND o.user_name LIKE CONCAT('%', #{userName}, '%')</if>
+            <if test="userPhone != null and userPhone != ''"> AND o.user_phone LIKE CONCAT('%', #{userPhone}, '%')</if>
             <if test="deliverySn != null and deliverySn != ''"> AND o.delivery_sn = #{deliverySn}</if>
+            <if test="deliveryName != null and deliveryName != ''"> AND o.delivery_name LIKE CONCAT('%', #{deliveryName}, '%')</if>
             <if test="status != null"> AND o.status = #{status}</if>
             <if test="companyId != null"> AND o.company_id = #{companyId}</if>
             <if test="returnStatus != null">
                 <if test="returnStatus == 1"> AND o.status = 4</if>
                 <if test="returnStatus == 0"> AND o.status != 4</if>
             </if>
+            <if test="returnUser != null and returnUser != ''"> AND o.update_by LIKE CONCAT('%', #{returnUser}, '%')</if>
+            <if test="returnTimeStart != null and returnTimeStart != ''"> AND o.update_time >= #{returnTimeStart}</if>
+            <if test="returnTimeEnd != null and returnTimeEnd != ''"> AND o.update_time &lt;= #{returnTimeEnd}</if>
+            <if test="totalPrice != null"> AND o.total_price = #{totalPrice}</if>
+            <if test="collectionPrice != null"> AND o.collection_price = #{collectionPrice}</if>
+            <if test="receiverPhone != null and receiverPhone != ''"> AND o.receiver_phone LIKE CONCAT('%', #{receiverPhone}, '%')</if>
+            <if test="remark != null and remark != ''"> AND o.remark LIKE CONCAT('%', #{remark}, '%')</if>
+            <if test="payType != null"> AND o.pay_type = #{payType}</if>
+            <if test="companyUserName != null and companyUserName != ''"> AND cu.user_name LIKE CONCAT('%', #{companyUserName}, '%')</if>
+            <if test="deptId != null"> AND cu.dept_id = #{deptId}</if>
+            <if test="sTime != null and sTime != ''"> AND o.external_create_time >= #{sTime}</if>
+            <if test="eTime != null and eTime != ''"> AND o.external_create_time &lt;= #{eTime}</if>
             <if test="deliveryStartTime != null and deliveryStartTime != ''"> AND o.delivery_time >= #{deliveryStartTime}</if>
             <if test="deliveryEndTime != null and deliveryEndTime != ''"> AND o.delivery_time &lt;= #{deliveryEndTime}</if>
         </where>
         GROUP BY o.order_id
+        <if test="productName != null and productName != ''">
+            HAVING GROUP_CONCAT(oi.product_name SEPARATOR ',') LIKE CONCAT('%', #{productName}, '%')
+        </if>
         ORDER BY o.create_time DESC
     </select>
 
@@ -517,11 +570,26 @@
             <if test="userAddress != null and userAddress != ''">
                 AND o.user_address LIKE CONCAT('%', #{userAddress}, '%')
             </if>
+            <if test="sTime != null and sTime != ''"> AND o.create_time >= #{sTime}</if>
+            <if test="eTime != null and eTime != ''"> AND o.create_time &lt;= #{eTime}</if>
+            <if test="payPrice != null"> AND o.pay_price = #{payPrice}</if>
+            <if test="totalPrice != null"> AND o.total_price = #{totalPrice}</if>
+            <if test="deliveryName != null and deliveryName != ''"> AND o.delivery_name LIKE CONCAT('%', #{deliveryName}, '%')</if>
+            <if test="returnUser != null and returnUser != ''"> AND o.update_by LIKE CONCAT('%', #{returnUser}, '%')</if>
+            <if test="returnTimeStart != null and returnTimeStart != ''"> AND o.update_time >= #{returnTimeStart}</if>
+            <if test="returnTimeEnd != null and returnTimeEnd != ''"> AND o.update_time &lt;= #{returnTimeEnd}</if>
+            <if test="userPhone != null and userPhone != ''"> AND o.user_phone LIKE CONCAT('%', #{userPhone}, '%')</if>
+            <if test="memberPhone != null and memberPhone != ''"> AND o.receiver_phone LIKE CONCAT('%', #{memberPhone}, '%')</if>
+            <if test="companyUserName != null and companyUserName != ''"> AND cu.user_name LIKE CONCAT('%', #{companyUserName}, '%')</if>
+            <if test="deptId != null"> AND cu.dept_id = #{deptId}</if>
             <if test="deliveryStartTime != null and deliveryStartTime != ''"> AND o.delivery_time >= #{deliveryStartTime}</if>
             <if test="deliveryEndTime != null and deliveryEndTime != ''"> AND o.delivery_time &lt;= #{deliveryEndTime}</if>
             <if test="companyId != null"> AND o.company_id = #{companyId}</if>
         </where>
         GROUP BY o.order_id,o.update_time
+        <if test="productName != null and productName != ''">
+            HAVING GROUP_CONCAT(oi.product_name SEPARATOR ',') LIKE CONCAT('%', #{productName}, '%')
+        </if>
         ORDER BY o.order_id DESC
     </select>
 
@@ -541,6 +609,11 @@
         <where>
             o.status = 4
             <if test="productName != null and productName != ''"> AND oi.product_name LIKE CONCAT('%', #{productName}, '%')</if>
+            <if test="deliveryName != null and deliveryName != ''"> AND o.delivery_name LIKE CONCAT('%', #{deliveryName}, '%')</if>
+            <if test="deptId != null"> AND cu.dept_id = #{deptId}</if>
+            <if test="returnTimeStart != null and returnTimeStart != ''"> AND o.update_time >= #{returnTimeStart}</if>
+            <if test="returnTimeEnd != null and returnTimeEnd != ''"> AND o.update_time &lt;= #{returnTimeEnd}</if>
+            <if test="companyId != null"> AND o.company_id = #{companyId}</if>
         </where>
         GROUP BY d.dept_name, o.delivery_name, oi.product_id, oi.product_name
         ORDER BY d.dept_name, o.delivery_name, oi.product_name
@@ -578,11 +651,24 @@
             <if test="userAddress != null and userAddress != ''">
                 AND o.user_address LIKE CONCAT('%', #{userAddress}, '%')
             </if>
+            <if test="sTime != null and sTime != ''"> AND o.create_time >= #{sTime}</if>
+            <if test="eTime != null and eTime != ''"> AND o.create_time &lt;= #{eTime}</if>
+            <if test="totalPrice != null"> AND o.total_price = #{totalPrice}</if>
+            <if test="deliveryName != null and deliveryName != ''"> AND o.delivery_name LIKE CONCAT('%', #{deliveryName}, '%')</if>
+            <if test="rejectReturnTimeStart != null and rejectReturnTimeStart != ''"> AND o.reject_return_time >= #{rejectReturnTimeStart}</if>
+            <if test="rejectReturnTimeEnd != null and rejectReturnTimeEnd != ''"> AND o.reject_return_time &lt;= #{rejectReturnTimeEnd}</if>
+            <if test="returnUser != null and returnUser != ''"> AND o.update_by LIKE CONCAT('%', #{returnUser}, '%')</if>
+            <if test="userPhone != null and userPhone != ''"> AND o.user_phone LIKE CONCAT('%', #{userPhone}, '%')</if>
+            <if test="memberPhone != null and memberPhone != ''"> AND o.receiver_phone LIKE CONCAT('%', #{memberPhone}, '%')</if>
+            <if test="companyUserName != null and companyUserName != ''"> AND cu.user_name LIKE CONCAT('%', #{companyUserName}, '%')</if>
             <if test="deliveryStartTime != null and deliveryStartTime != ''"> AND o.delivery_time >= #{deliveryStartTime}</if>
             <if test="deliveryEndTime != null and deliveryEndTime != ''"> AND o.delivery_time &lt;= #{deliveryEndTime}</if>
             <if test="companyId != null"> AND o.company_id = #{companyId}</if>
         </where>
         GROUP BY o.order_id,o.reject_return_time
+        <if test="productName != null and productName != ''">
+            HAVING GROUP_CONCAT(oi.product_name SEPARATOR ',') LIKE CONCAT('%', #{productName}, '%')
+        </if>
         ORDER BY o.order_id DESC
     </select> 
 
@@ -601,9 +687,15 @@
         <where>
             o.delivery_status IN (4, 5, 6)
             <if test="productName != null and productName != ''"> AND oi.product_name LIKE CONCAT('%', #{productName}, '%')</if>
+            <if test="deliveryName != null and deliveryName != ''"> AND o.delivery_name LIKE CONCAT('%', #{deliveryName}, '%')</if>
             <if test="companyId != null"> AND o.company_id = #{companyId}</if>
         </where>
         GROUP BY o.delivery_name, oi.product_id, oi.product_name
+        <if test="totalNum != null or totalPrice != null">
+            HAVING 1=1
+            <if test="totalNum != null"> AND SUM(oi.num) = #{totalNum}</if>
+            <if test="totalPrice != null"> AND SUM(oi.price * oi.num) = #{totalPrice}</if>
+        </if>
         ORDER BY o.delivery_name, oi.product_name
     </select>
 
@@ -632,6 +724,13 @@
             <if test="deliverySn != null and deliverySn != ''"> AND o.delivery_sn = #{deliverySn}</if>
             <if test="userName != null and userName != ''"> AND o.user_name LIKE CONCAT('%', #{userName}, '%')</if>
             <if test="userAddress != null and userAddress != ''"> AND o.user_address LIKE CONCAT('%', #{userAddress}, '%')</if>
+            <if test="payPrice != null"> AND o.pay_price = #{payPrice}</if>
+            <if test="collectionPrice != null"> AND o.collection_price = #{collectionPrice}</if>
+            <if test="totalPrice != null"> AND o.total_price = #{totalPrice}</if>
+            <if test="followTimeStart != null and followTimeStart != ''"> AND o.follow_time &gt;= #{followTimeStart}</if>
+            <if test="followTimeEnd != null and followTimeEnd != ''"> AND o.follow_time &lt;= #{followTimeEnd}</if>
+            <if test="deliveryName != null and deliveryName != ''"> AND o.delivery_name LIKE CONCAT('%', #{deliveryName}, '%')</if>
+            <if test="deptId != null"> AND cu.dept_id = #{deptId}</if>
             <if test="deliveryStartTime != null and deliveryStartTime != ''"> AND o.delivery_time &gt;= #{deliveryStartTime}</if>
             <if test="deliveryEndTime != null and deliveryEndTime != ''"> AND o.delivery_time &lt;= #{deliveryEndTime}</if>
             <if test="companyId != null"> AND o.company_id = #{companyId}</if>
@@ -660,6 +759,10 @@
             <if test="deliverySn != null and deliverySn != ''"> AND o.delivery_sn = #{deliverySn}</if>
             <if test="userName != null and userName != ''"> AND o.user_name LIKE CONCAT('%', #{userName}, '%')</if>
             <if test="userAddress != null and userAddress != ''"> AND o.user_address LIKE CONCAT('%', #{userAddress}, '%')</if>
+            <if test="totalPrice != null"> AND o.total_price = #{totalPrice}</if>
+            <if test="followTimeStart != null and followTimeStart != ''"> AND o.follow_time &gt;= #{followTimeStart}</if>
+            <if test="followTimeEnd != null and followTimeEnd != ''"> AND o.follow_time &lt;= #{followTimeEnd}</if>
+            <if test="deliveryName != null and deliveryName != ''"> AND o.delivery_name LIKE CONCAT('%', #{deliveryName}, '%')</if>
             <if test="deliveryStartTime != null and deliveryStartTime != ''"> AND o.delivery_time &gt;= #{deliveryStartTime}</if>
             <if test="deliveryEndTime != null and deliveryEndTime != ''"> AND o.delivery_time &lt;= #{deliveryEndTime}</if>
             <if test="companyId != null"> AND o.company_id = #{companyId}</if>
@@ -706,6 +809,12 @@
             </where>
             GROUP BY d.dept_id, d.dept_name, c.company_id, c.company_name
         ) t
+        <where>
+            <if test="deliveryCount != null"> AND t.delivery_count = #{deliveryCount}</if>
+            <if test="deliveryAmount != null"> AND t.delivery_amount = #{deliveryAmount}</if>
+            <if test="signCount != null"> AND t.sign_count = #{signCount}</if>
+            <if test="signAmount != null"> AND t.sign_amount = #{signAmount}</if>
+        </where>
         ORDER BY t.company_name, t.dept_name, t.order_type
     </select>
 

fs-service/src/main/resources/mapper/his/FsStoreOrderMapper.xml

@@ -407,6 +407,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="source != null">source = #{source},</if>
             <if test="billPrice != null">bill_price = #{billPrice},</if>
             <if test="erpPhone != null and erpPhone != ''">erp_phone = #{erpPhone},</if>
+            <if test="depositReturnTime != null">deposit_return_time = #{depositReturnTime},</if>
+            <if test="collectionPrice != null">collection_price = #{collectionPrice},</if>
+            <if test="refundPrice != null">refund_price = #{refundPrice},</if>
+            <if test="auditor != null">auditor = #{auditor},</if>
+            <if test="auditTime != null">audit_time = #{auditTime},</if>
+            <if test="diseaseName != null">disease_name = #{diseaseName},</if>
+            <if test="returnPrice != null">return_price = #{returnPrice},</if>
+            <if test="deliveryStatusUpdateTime != null">delivery_status_update_time = #{deliveryStatusUpdateTime},</if>
+            <if test="deliveryStatusUpdateBy != null">delivery_status_update_by = #{deliveryStatusUpdateBy},</if>
+            <if test="rejectReturnTime != null">reject_return_time = #{rejectReturnTime},</if>
+            <if test="isReturnGoods != null">is_return_goods = #{isReturnGoods},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
         </trim>
         where order_id = #{orderId}
     </update>

fs-watch/src/main/resources/application.yml

@@ -0,0 +1,16 @@
+# 开发环境配置
+server:
+  # 服务器的HTTP端口，默认为8114
+  port: 8114
+
+# Spring配置
+spring:
+  profiles:
+#    active: dev
+#    active: druid-jzzx
+#    active: druid-yzt
+#    active: druid-hdt
+#    active: druid-sxjz
+#    active: druid-qdtst
+#    active: druid-yzt
+    active: druid-hdt