定向派单修改

src/main/java/com/steerinfo/dil/controller/AmsSaleOrderController.java

@@ -1,6 +1,8 @@
 package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.feign.ColumnDataFeign;
+import com.steerinfo.dil.mapper.AmsDispatchSaleOrderMapper;
+import com.steerinfo.dil.mapper.AmsSaleOrderMapper;
 import com.steerinfo.dil.model.AmsDispatchSaleOrder;
 import com.steerinfo.dil.model.AmsSaleOrder;
 import com.steerinfo.dil.service.IAmsSaleOrderService;
@@ -8,6 +10,7 @@ import com.steerinfo.dil.service.impl.AmsDispatchSaleOrderServiceImpl;
 import com.steerinfo.dil.service.impl.AmsSaleOrderMaterialServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
@@ -49,7 +52,8 @@ public class AmsSaleOrderController extends BaseRESTfulController {
     AmsDispatchSaleOrderServiceImpl amsDispatchSaleOrderService;
     @Autowired
     ColumnDataFeign columnDataFeign;
-
+    @Autowired
+    AmsDispatchSaleOrderMapper amsDispatchSaleOrderMapper;
     @Autowired
     ColumnDataUtil columnDataUtil;
 
@@ -276,7 +280,12 @@ public class AmsSaleOrderController extends BaseRESTfulController {
     public RESTfulResult getSaleOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
                                           Integer pageNum,
                                           Integer pageSize,
-                                          Integer apiId) {
+                                          Integer apiId,
+                                          Integer status) {
+
+        if (status!=null){
+            mapValue.put("status",status);
+        }
         List<Map<String, Object>> list = amsSaleOrderService.getSaleOrderList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
@@ -294,8 +303,8 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         }
         for (Map<String,Object> m:mapValue
         ) {
-//Integer id=amsSaleOrderMaterialService.selectByCxh(m);
-            Integer id=Integer.parseInt(m.get("orderMaterialId").toString()) ;
+         //Integer id=amsSaleOrderMaterialService.selectByCxh(m);
+            Integer id = Integer.parseInt(m.get("orderMaterialId").toString()) ;
             System.out.println(id);
             //通过主键Id获取地址id
             Integer a=amsSaleOrderMaterialService.selectById(new BigDecimal(id));
@@ -305,17 +314,17 @@ public class AmsSaleOrderController extends BaseRESTfulController {
             if(carriers.size()==1) {
                 //新增固定派单
                 AmsDispatchSaleOrder ad = new AmsDispatchSaleOrder();
-                ad.setDispatchId(amsDispatchSaleOrderService.selectMaxId());
+                ad.setDispatchId(DataChange.dataToBigDecimal(m.get("dispatchId")));
                 ad.setSaleOrderMaterialId(new BigDecimal(id));
                 ad.setCarrierId(new BigDecimal(carriers.get(0)));
                 ad.setDispatchDealTime(new Date());
                 ad.setDispatchTime(new Date());
                 //成交类型（0：定向派单；1：公开抢单）
                 ad.setDispatchType(new BigDecimal(0));
-                //销售订单车序号状态（0：自由；1：锁定）
-                ad.setDispatchStatus(new BigDecimal(1));
-                amsDispatchSaleOrderService.insert(ad);
-                return success("插入成功");
+                //销售订单车序号状态（0：已下发；1：未下发）
+                ad.setDispatchStatus(new BigDecimal(0));
+                int i = amsDispatchSaleOrderMapper.updateByPrimaryKeySelective(ad);
+                return success(i);
             }
         }
         return success();

src/main/java/com/steerinfo/dil/service/IAmsSaleOrderService.java

@@ -50,4 +50,6 @@ public interface IAmsSaleOrderService{
     List<Map<String,Object>> getSaleOrderList(Map<String,Object> mapValue);
     //获得承运商
     List<Integer> getCarrier(Integer integer);
+
+
 }

src/main/resources/com/steerinfo/dil/mapper/AmsSaleOrderMapper.xml

@@ -1148,8 +1148,10 @@
   <!-- 展示所有销售公司已审核的销售订单 -->
   <select id="getSaleOrderList" parameterType="java.util.Map" resultType="java.util.Map">
     select
+      adso.DISPATCH_ID "dispatchId",
       asom.SALE_ORDER_MATERIAL_ID "orderMaterialId",
       asom.sale_order_id as "saleOrderId",
+      aso.SALE_NUMBER "saleNumber",
       asom.sale_order_material_truck_no as "saleOrderMaterialTruckNo",
       asom.sale_order_material_id,
       rra.address_delivery_address as "addressDeliveryAddress",
@@ -1157,9 +1159,12 @@
       asom.sale_order_consignee as "saleOrderConsignee",
       asom.sale_order_consignee_tel as "saleOrderConsigneeTel"
     from ams_sale_order aso
-           join ams_sale_order_material asom on aso.sale_order_id =asom.sale_order_id
+           join ams_sale_order_material asom
+               on aso.sale_order_id =asom.sale_order_id
+            left join AMS_DISPATCH_SALE_ORDER adso
+                on adso.SALE_ORDER_MATERIAL_ID = asom.SALE_ORDER_MATERIAL_ID
            left join rms_receive_address rra on asom.sale_shipping_address_id=rra.address_id
-    where asom.sale_order_material_id not in (select adso.sale_order_material_id from ams_dispatch_sale_order adso group by adso.sale_order_material_id) and aso.sale_order_status=2 or aso.sale_order_status=4
+    where aso.sale_order_status in (2, 4) and adso.DISPATCH_STATUS = #{status}
   </select>
 
   <!-- 通过收货地址，匹配对应的承运商-->