'销售应用权限'

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

@@ -63,8 +63,8 @@ public class AmsDispatchSaleOrderController extends BaseRESTfulController {
     @ApiOperation(value="抢单/接收订单锁定")
     @PostMapping("/lockDispatchSaleOrder")
     public RESTfulResult lockDispatchSaleOrder(@RequestParam Integer dispatchId,
-                                               @RequestParam Integer carrierId) {
-        int result = amsDispatchSaleOrderService.lockDispatchSaleOrder(new BigDecimal(dispatchId),new BigDecimal(carrierId));
+                                               @RequestParam String carrierSsoId) {
+        int result = amsDispatchSaleOrderService.lockDispatchSaleOrder(new BigDecimal(dispatchId),carrierSsoId);
         return success(result);
     }
 
@@ -77,11 +77,11 @@ public class AmsDispatchSaleOrderController extends BaseRESTfulController {
                                               Integer apiId,
                                               Integer pageNum,
                                               Integer pageSize,
-                                              String carrierSSOId){
+                                              String carrierSsoId){
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        mapValue.put("carrierSSOId",carrierSSOId);
+        mapValue.put("carrierSsoId",carrierSsoId);
         List<Map<String, Object>> amsSaleOrder = amsDispatchSaleOrderService.getLockDispatchSaleOrderListForPc(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSaleOrder1 = amsDispatchSaleOrderService.getLockDispatchSaleOrderListForPc(mapValue);
@@ -99,6 +99,7 @@ public class AmsDispatchSaleOrderController extends BaseRESTfulController {
                                                     Integer pageNum,
                                                     Integer pageSize,
                                                     Integer dispatchType,
+                                                    String carrierSsoId,
                                                     String con){
         if (con != null) {
             if(!"undefined".equals(con)){
@@ -107,8 +108,9 @@ public class AmsDispatchSaleOrderController extends BaseRESTfulController {
             }
         }
         mapValue.put("dispatchType",dispatchType);
+        mapValue.put("carrierSsoId",carrierSsoId);
         List<Map<String, Object>> dispatchSaleOrderList = null;
-        if (mapValue.size() == 1) {
+        if (mapValue.size() == 2) {
             //将查询结果存入索引中
             dispatchSaleOrderList =  amsDispatchSaleOrderService.getPCDispatchSaleOrderList(mapValue);
             Map<String, Object> map1 = new HashMap<>();

src/main/java/com/steerinfo/dil/mapper/AmsDispatchSaleOrderMapper.java

@@ -42,5 +42,5 @@ public interface AmsDispatchSaleOrderMapper extends IBaseMapper<AmsDispatchSaleO
     List<Map<String, Object>> getDispatchMaterialList(BigDecimal dispatchId);
 
     // 通过ssoid查询承运商
-    BigDecimal getCarrierIdBySSO(String carrierSSOId);
+    BigDecimal getCarrierIdBySSO(String carrierSsoId);
 }

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

@@ -39,10 +39,10 @@ public interface IAmsDispatchSaleOrderService{
     /**
      * 抢单
      * @param dispatchId
-     * @param carrierId
+     * @param carrierSsoId
      * @return
      */
-    int lockDispatchSaleOrder(BigDecimal dispatchId,BigDecimal carrierId);
+    int lockDispatchSaleOrder(BigDecimal dispatchId,String carrierSsoId);
 
     /**
      * 查询app端已抢的销售订单

src/main/java/com/steerinfo/dil/service/impl/AmsDispatchSaleOrderServiceImpl.java

@@ -147,11 +147,12 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
     /**
      * 抢单/接收订单
      * @param dispatchId
-     * @param carrierId
+     * @param carrierSsoId
      * @return
      */
     @Override
-    public int lockDispatchSaleOrder(BigDecimal dispatchId, BigDecimal carrierId) {
+    public int lockDispatchSaleOrder(BigDecimal dispatchId, String carrierSsoId) {
+        BigDecimal carrierId = amsDispatchSaleOrderMapper.getCarrierIdBySSO(carrierSsoId);
         AmsDispatchSaleOrder amsDispatchSaleOrder = amsDispatchSaleOrderMapper.selectByPrimaryKey(dispatchId);
         amsDispatchSaleOrder.setDispatchDealTime(new Date());
         amsDispatchSaleOrder.setCarrierId(carrierId);
@@ -253,8 +254,8 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
      */
     @Override
     public List<Map<String, Object>> getLockDispatchSaleOrderListForPc(Map<String,Object> mapValue) {
-        String carrierSSOId = (String) mapValue.get("carrierSSOId");
-        BigDecimal carrierId = amsDispatchSaleOrderMapper.getCarrierIdBySSO(carrierSSOId);
+        String carrierSsoId = (String) mapValue.get("carrierSsoId");
+        BigDecimal carrierId = amsDispatchSaleOrderMapper.getCarrierIdBySSO(carrierSsoId);
         mapValue.put("carrierId",carrierId);
         List<Map<String, Object>> mapList = amsDispatchSaleOrderMapper.getLockDispatchSaleOrderListForPc(mapValue);
         if (mapList == null) {
@@ -340,6 +341,9 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
      */
     @Override
     public List<Map<String, Object>> getPCDispatchSaleOrderList(Map<String, Object> mapValue) {
+        String carrierSsoId = (String) mapValue.get("carrierSsoId");
+        BigDecimal carrierId = amsDispatchSaleOrderMapper.getCarrierIdBySSO(carrierSsoId);
+        mapValue.put("carrierId",carrierId);
         List<Map<String, Object>> dispatchSaleOrderList = amsDispatchSaleOrderMapper.getPCDispatchSaleOrderList(mapValue);
         for (Map<String,Object> map: dispatchSaleOrderList) {
 //            Date dispatchDealTime = (Date) map.get("dispatchDealTime");

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

@@ -520,7 +520,9 @@
                  LEFT JOIN RMS_CARRIER RCA
                            ON RCA.CARRIER_ID = ADSO.CARRIER_ID
         WHERE ADSO.DISPATCH_STATUS = 0
-          AND ADSO.CARRIER_ID = #{carrierId}
+          <if test="carrierId != null" >
+              AND ADSO.CARRIER_ID = #{carrierId}
+          </if>
           AND OO.CAPACITY_ID IS NULL
           AND ADSO.DISPATCH_DEAL_TIME IS NOT NULL
     </select>
@@ -563,6 +565,9 @@
         WHERE ADSO.DISPATCH_TYPE = #{dispatchType}
         AND ADSO.DISPATCH_STATUS = 0
         AND ADSO.DISPATCH_DEAL_TIME IS NULL
+        <if test="carrierId != null" >
+            AND ADSO.CARRIER_ID = #{carrierId}
+        </if>
         )
         <where>
             <if test="saleOrderMaterialTruckNo != null">
@@ -647,6 +652,6 @@
         SELECT
             RC.CARRIER_ID AS "carrierId"
         FROM RMS_CARRIER RC
-        WHERE RC.CARRIER_SSO_ID = #{carrierSSOId}
+        WHERE RC.CARRIER_SSO_ID = #{carrierSsoId}
     </select>
 </mapper>