修改

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

@@ -409,56 +409,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 rmsConsignee.setInsertUpdateRemark("通过销售订单自增");
                 rmsConsigneeMapper.insertSelective(rmsConsignee);
             }
-            try {
-                //根据摘要和收货客户ID查询
-                if(isSelfMention != null && isSelfMention.equals("CARRY")) {
-                    //如果是自提,那么将该客户的结算方式改为自提
-                    rmsConsigneeMapper.updateConsigneeSettled(receiveId,"自提");
-                }else if(isSelfMention != null && !isSelfMention.equals("CARRY")){
-                    //查询该客户对应的结算方式是什么
-                    Map<String,Object> settleMethodWlMap = rmsConsigneeMapper.selectSettleMethod(receiveId);
-                    String settleMethodWl = null;
-                    if(settleMethodWlMap.get("settleMethodWl") != null) {
-                        settleMethodWl = settleMethodWlMap.get("settleMethodWl").toString();
-                    }
-                    String settleMethodEas = " ";
-                    if(saleRemark != null && saleRemark.contains("钢材工程组")){
-                        settleMethodEas = "一票制";
-                        if(!settleMethodEas.equals(settleMethodWl)) {
-                            rmsConsigneeMapper.updateConsigneeSettled(receiveId,"一票制");
-                            if(settleMethodWlMap.get("userId") != null) {
-                                String userId = settleMethodWlMap.get("userId").toString();
-                                Map<String, Object> tokenMap = ssoFeign.login("adminMannage", "7c4a8d09ca3762af61e59520943dc26494f8941b");
-                                Map<String,Object> data = (Map<String, Object>) tokenMap.get("data");
-                                String token = (String) data.get("accessToken");
-                                Map<String,Object> userRoleResponseMap = ssoFeign.getSysuserrole("Bearer " + token,userId,1,100);
-                                Map<String,Object> userRoleMap = ((List<Map<String, Object>>)((Map<String, Object>)userRoleResponseMap.get("data")).get("list")).get(0);
-                                String userRoleId = userRoleMap.get("userRoleId").toString();
-                                ssoFeign.sysuserrole("Bearer " + token, userId);
-                                ssoFeign.addUserroles("Bearer " + token,userId, receiveUnitName, "1054405653877100544");
-                            }
-                        }
-                    }else{
-                        if(!settleMethodEas.equals(settleMethodWl)) {
-                            rmsConsigneeMapper.updateConsigneeSettled(receiveId,"两票制");
-                            if(settleMethodWlMap.get("userId") != null) {
-                                String userId = settleMethodWlMap.get("userId").toString();
-                                Map<String, Object> tokenMap = ssoFeign.login("adminMannage", "7c4a8d09ca3762af61e59520943dc26494f8941b");
-                                Map<String,Object> data = (Map<String, Object>) tokenMap.get("data");
-                                String token = (String) data.get("accessToken");
-                                Map<String,Object> userRoleResponseMap = ssoFeign.getSysuserrole("Bearer " + token,userId,1,100);
-                                Map<String,Object> userRoleMap = ((List<Map<String, Object>>)((Map<String, Object>)userRoleResponseMap.get("data")).get("list")).get(0);
-                                String userRoleId = userRoleMap.get("userRoleId").toString();
-                                ssoFeign.sysuserrole("Bearer " + token, userRoleId);
-                                ssoFeign.addUserroles("Bearer " + token,userId, receiveUnitName, "1042116550569627648");
-                            }
-                        }
-                    }
 
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
             // 得到发货单位
             String shipperUnit = (String) mapVal.get("shipperUnit");
             BigDecimal shipperId = amsSaleOrderMapper.getShipperId(shipperUnit);
@@ -651,6 +602,56 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     }catch (Exception e) {
                         e.printStackTrace();
                     }
+                    try {
+                        //根据摘要和收货客户ID查询
+                        if(isSelfMention != null && isSelfMention.equals("CARRY")) {
+                            //如果是自提,那么将该客户的结算方式改为自提
+                            rmsConsigneeMapper.updateConsigneeSettled(receiveId,"自提");
+                        }else if(isSelfMention != null && !isSelfMention.equals("CARRY")){
+                            //查询该客户对应的结算方式是什么
+                            Map<String,Object> settleMethodWlMap = rmsConsigneeMapper.selectSettleMethod(receiveId);
+                            String settleMethodWl = null;
+                            if(settleMethodWlMap.get("settleMethodWl") != null) {
+                                settleMethodWl = settleMethodWlMap.get("settleMethodWl").toString();
+                            }
+                            String settleMethodEas = " ";
+                            if(saleRemark != null && saleRemark.contains("钢材工程组")){
+                                settleMethodEas = "一票制";
+                                if(!settleMethodEas.equals(settleMethodWl)) {
+                                    rmsConsigneeMapper.updateConsigneeSettled(receiveId,"一票制");
+                                    if(settleMethodWlMap.get("userId") != null) {
+                                        String userId = settleMethodWlMap.get("userId").toString();
+                                        Map<String, Object> tokenMap = ssoFeign.login("adminMannage", "7c4a8d09ca3762af61e59520943dc26494f8941b");
+                                        Map<String,Object> data = (Map<String, Object>) tokenMap.get("data");
+                                        String token = (String) data.get("accessToken");
+                                        Map<String,Object> userRoleResponseMap = ssoFeign.getSysuserrole("Bearer " + token,userId,1,100);
+                                        Map<String,Object> userRoleMap = ((List<Map<String, Object>>)((Map<String, Object>)userRoleResponseMap.get("data")).get("list")).get(0);
+                                        String userRoleId = userRoleMap.get("userRoleId").toString();
+                                        ssoFeign.sysuserrole("Bearer " + token, userRoleId);
+                                        ssoFeign.addUserroles("Bearer " + token,userId, receiveUnitName, "1054405653877100544");
+                                    }
+                                }
+                            }else{
+                                if(!settleMethodEas.equals(settleMethodWl)) {
+                                    rmsConsigneeMapper.updateConsigneeSettled(receiveId,"两票制");
+                                    if(settleMethodWlMap.get("userId") != null) {
+                                        String userId = settleMethodWlMap.get("userId").toString();
+                                        Map<String, Object> tokenMap = ssoFeign.login("adminMannage", "7c4a8d09ca3762af61e59520943dc26494f8941b");
+                                        Map<String,Object> data = (Map<String, Object>) tokenMap.get("data");
+                                        String token = (String) data.get("accessToken");
+                                        Map<String,Object> userRoleResponseMap = ssoFeign.getSysuserrole("Bearer " + token,userId,1,100);
+                                        Map<String,Object> userRoleMap = ((List<Map<String, Object>>)((Map<String, Object>)userRoleResponseMap.get("data")).get("list")).get(0);
+                                        String userRoleId = userRoleMap.get("userRoleId").toString();
+                                        ssoFeign.sysuserrole("Bearer " + token, userRoleId);
+                                        ssoFeign.addUserroles("Bearer " + token,userId, receiveUnitName, "1042116550569627648");
+                                    }
+                                }
+                            }
+
+                        }
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                 }
                 amsSaleOrder.setSaleNumber(saleNumber);
                 amsSaleOrder.setSaleAccountBalance(new BigDecimal(saleAccountBalance));