1，关键词搜索。

2，未约点了拨打，不用再形成超时了；未牌的超时标签不对（现在是超时未约单）
3，主单接单超时退到大厅的，和主单拒绝接单退到大厅的，大厅里面的单没见到。不知道去哪了。

ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java

@@ -927,11 +927,16 @@ public class OrderDetailController extends BaseController {
         // 退换加价费用
         List<FinancialChangeRecord> fcrList = financialChangeRecordService.selectByDetailIds(orderDetail.getId().toString());
         // 先把这个子单的加价单全退了
+        // 主订单金额=订单原价+加价
+        BigDecimal payMoney = financialMaster.getPayMoney();
         for (FinancialChangeRecord fcr : fcrList) {
             if (PayStatus.PAID.getCode().equals(fcr.getPayStatus()) || PayStatus.PAYED_ADD.getCode().equals(fcr.getPayStatus())) {
                 executor.execute(() -> financialChangeRecordService.refund(om.getDeptId(), fcr.getId()));
+                payMoney = payMoney.subtract(fcr.getChangeMoney());
             }
         }
+        financialMaster.setPayMoney(payMoney);
+        financialMasterService.updateFinancialMaster(financialMaster);
         // 退回旧商品
 //        List<OrderGoods> goodsList = orderGoodsService.selectByOrderDetailId(orderDetail.getId());
 //        goodsList.forEach(orderGoods -> {

ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java

@@ -239,6 +239,7 @@ public class OrderMasterController extends BaseController {
             orderListResponse.setTimeoutFineTimes(master.getTimeoutFineTimes());
             orderListResponse.setAfterServiceRecordList(afterServiceRecords);
             orderListResponse.setServerMoney(master.getServerMoney());
+            orderListResponse.setIsCall(master.getIsCall());
             orderListResponses.add(orderListResponse);
 
         });
@@ -614,6 +615,7 @@ public class OrderMasterController extends BaseController {
             orderListResponse.setFinalRecvMoney(finalRecvMoney);
             orderListResponse.setGoodsAreaList(goods.getGoodsAreaList());
             orderListResponse.setOrderMode(orderMaster.getOrderMode());
+            orderListResponse.setIsCall(orderMaster.getIsCall());
 
             return AjaxResult.success(orderListResponse);
         } catch (Exception e) {

ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java

@@ -16,6 +16,8 @@ import java.util.List;
 @Data
 public class OrderListResponse {
 
+    private String isCall;
+
     private Long orderMasterId;
 
     private String orderMasterCode;

ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml

@@ -140,7 +140,8 @@
                 AND sa.parent_code != #{exceptParentAreaId}
             </if>
             <if test="goodsName != null and goodsName != ''">
-                AND goods_name like concat('%', #{goodsName}, '%')
+                AND (goods_name like concat('%', #{goodsName}, '%')
+                OR g.goods_desc LIKE concat('%', #{goodsName}, '%'))
             </if>
             <if test="status != null">
                 AND status = #{status}
@@ -151,9 +152,6 @@
             <if test="goodsId != null">
                 AND g.goods_id = #{goodsId}
             </if>
-            <if test="keyword != null and keyword != ''">
-                AND g.keyword LIKE concat('%', #{keyword}, '%')
-            </if>
         </where>
         /* 默认生成时间排序 */
         order by create_time

ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml

@@ -139,7 +139,7 @@
             <if test="workerId == -1">
                 AND om.worker_id IS NULL
                 AND ( (om.order_mode in ('01','03','04'))
-                     OR (om.order_mode = '02' and fm.pay_status = 1) )
+                     OR (om.order_mode = '02' and fm.pay_status = 1) OR (om.order_mode is null))
             </if>
             <if test="sysPayStatus != null">
                 AND fm.pay_status = #{sysPayStatus}