标准地址

performance-api/src/main/java/com/clx/performance/feign/PerformanceFeign.java

@@ -84,4 +84,7 @@ public interface PerformanceFeign {
 
     @GetMapping(value = {"clx-performance/feign/orderChild/selectInTransitOrderChild"})
     Result<Boolean> selectInTransitOrderChild(@RequestParam("orderNo") String orderNo);
+    @GetMapping(value = {"clx-performance/feign/orderGoods/updateSystemAddressId"})
+    Result<Boolean> updateSystemAddressId(@RequestParam("ownerAddressId") Integer ownerAddressId,@RequestParam("systemAddressId") Integer systemAddressId);
+
 }

performance-web/src/main/java/com/clx/performance/controller/feign/OrderGoodsFeignController.java

@@ -35,4 +35,10 @@ public class OrderGoodsFeignController {
         return Result.ok(orderGoodsService.updateOrderGoodsStopFlag(orderNo,stopFlag));
     }
 
+    @GetMapping({"/updateSystemAddressId"})
+    Result<Boolean> updateSystemAddressId(@RequestParam("ownerAddressId") @NotBlank(message = "货主地址id不能为空") Integer ownerAddressId,
+                                             @RequestParam("systemAddressId") @NotNull(message = "系统地址id不能为空") Integer systemAddressId) {
+        return Result.ok(orderGoodsService.updateSystemAddressId(ownerAddressId,systemAddressId));
+    }
+
 }

performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java

@@ -117,4 +117,7 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
                                         @Param("receiveAddressId") Integer receiveAddressId,
                                         @Param("beginTime") String beginTime);
 
+    void updateSendSystemAddress(Integer ownerAddressId, Integer systemAddressId);
+    void updateReceiveSystemAddress(Integer ownerAddressId, Integer systemAddressId);
+
 }

performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDao.java

@@ -78,4 +78,8 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
     boolean batchUpdateOrderGoodsStatus(Integer status, List<Integer> ids);
 
     boolean batchUpdateOrderGoodsWeight(BigDecimal residueWeight, List<Integer> ids);
+
+
+    void updateSendSystemAddress(Integer ownerAddressId, Integer systemAddressId);
+    void updateReceiveSystemAddress(Integer ownerAddressId, Integer systemAddressId);
 }

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

@@ -9,6 +9,7 @@ import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.enums.OrderChildEnum;
 import com.clx.performance.mapper.OrderChildMapper;
 import com.clx.performance.model.OrderChild;
+import com.clx.performance.model.OrderGoods;
 import com.clx.performance.param.app.PageOrderChildOfDriverParam;
 import com.clx.performance.param.app.PageOrderChildOfDriverSearchParam;
 import com.clx.performance.param.pc.PageCarrierOrderChildParam;
@@ -385,4 +386,20 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
 
     }
 
+    @Override
+    public void updateSendSystemAddress(Integer ownerAddressId, Integer systemAddressId) {
+        update(lUdWrapper()
+                .eq(OrderChild::getSendAddressId, ownerAddressId)
+                .set(OrderChild::getSendSystemAddressId, systemAddressId)
+        );
+    }
+
+    @Override
+    public void updateReceiveSystemAddress(Integer ownerAddressId, Integer systemAddressId) {
+        update(lUdWrapper()
+                .eq(OrderChild::getReceiveAddressId, ownerAddressId)
+                .set(OrderChild::getReceiveSystemAddressId, systemAddressId)
+        );
+    }
+
 }

performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java

@@ -209,4 +209,21 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
     }
 
 
+    @Override
+    public void updateSendSystemAddress(Integer ownerAddressId, Integer systemAddressId) {
+        update(lUdWrapper()
+                .eq(OrderGoods::getSendAddressId, ownerAddressId)
+                .set(OrderGoods::getSendSystemAddressId, systemAddressId)
+        );
+    }
+
+    @Override
+    public void updateReceiveSystemAddress(Integer ownerAddressId, Integer systemAddressId) {
+        update(lUdWrapper()
+                .eq(OrderGoods::getReceiveAddressId, ownerAddressId)
+                .set(OrderGoods::getReceiveSystemAddressId, systemAddressId)
+        );
+    }
+
+
 }

performance-web/src/main/java/com/clx/performance/model/OrderChild.java

@@ -43,8 +43,10 @@ public class OrderChild implements HasKey<Integer> {
 
     private Integer sendAddressId;                  //发货地址id
     private String sendAddress;                     //发货地址
+    private Integer sendSystemAddressId;            //发货标准地址id
     private Integer receiveAddressId;               //收货地址id
     private String receiveAddress;                  //收货地址
+    private Integer receiveSystemAddressId;         //收货标准地址id
     private LocalDateTime loadDeadline;             //最晚装货时间
 
     private Long truckOwnUserNo;                    //车主编号
@@ -89,7 +91,7 @@ public class OrderChild implements HasKey<Integer> {
     private LocalDateTime expectReceiveTime;                      //预计到达目的地时间
 
     private Integer settlementAccountPeriod;                 //结算账期  1拉运完成结  2月结
-    
+
     private Integer settlementWay;                          //结算方式  1装车净重 2卸车净重
 
     private LocalDateTime createTime;                      //创建时间
@@ -101,4 +103,4 @@ public class OrderChild implements HasKey<Integer> {
         return id;
     }
 
-}
+}
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/model/OrderGoods.java

@@ -72,6 +72,10 @@ public class OrderGoods implements HasKey<Integer> {
     @ApiModelProperty("发货地址简称")
     private String sendAddressShorter;
 
+    @TableField("send_system_address_id")
+    @ApiModelProperty("发货标准地址ID")
+    private Integer sendSystemAddressId;
+
     @TableField("send_longitude")
     @ApiModelProperty("发货地址经度")
     private BigDecimal sendLongitude;
@@ -88,6 +92,10 @@ public class OrderGoods implements HasKey<Integer> {
     @ApiModelProperty("收货地址简称")
     private String receiveAddressShorter;
 
+    @TableField("receive_system_address_id")
+    @ApiModelProperty("收货标准地址ID")
+    private Integer receiveSystemAddressId;
+
     @TableField("receive_longitude")
     @ApiModelProperty("收货地址经度")
     private BigDecimal receiveLongitude;

performance-web/src/main/java/com/clx/performance/service/OrderGoodsService.java

@@ -12,7 +12,9 @@ import com.clx.performance.vo.app.OrderGoodsAPPVO;
 import com.clx.performance.vo.feign.OrderGoodsFeignVO;
 import com.clx.performance.vo.pc.OrderGoodsEditVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
+import org.springframework.web.bind.annotation.RequestParam;
 
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -87,4 +89,6 @@ public interface OrderGoodsService {
      * @return
      */
     OrderGoodsEditVO findOrderGoodsById(Integer id);
+
+    Boolean updateSystemAddressId( Integer ownerAddressId, Integer systemAddressId);
 }

performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java

@@ -50,6 +50,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -610,4 +611,17 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
 
         return result;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateSystemAddressId(Integer ownerAddressId, Integer systemAddressId) {
+
+        orderGoodsDao.updateSendSystemAddress(ownerAddressId, systemAddressId);
+        orderGoodsDao.updateReceiveSystemAddress(ownerAddressId, systemAddressId);
+
+        orderChildDao.updateSendSystemAddress(ownerAddressId, systemAddressId);
+        orderChildDao.updateReceiveSystemAddress(ownerAddressId, systemAddressId);
+
+        return true;
+    }
 }