2023年9月8日13:51:45

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjOrder.java

@@ -209,16 +209,16 @@ public class PjOrder implements Serializable {
 	 * 物流公司id
 	 */
 	@ApiModelProperty(value = "物流公司id")
-	private Long logisticsCorpId;
+	private String logisticsCorpId;
 	/**
 	 * 物流公司名称
 	 */
 	@ApiModelProperty(value = "物流公司名称")
 	private String logisticsCorpName;
 	/**
-	 * 快递单号
+	 * 物流单号
 	 */
-	@ApiModelProperty(value = "快递单号")
+	@ApiModelProperty(value = "物流单号")
 	private String expressNo;
 	/**
 	 * 经手人

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjShip.java

@@ -287,4 +287,25 @@ public class PjShip implements Serializable {
 	 */
 	@TableField(exist = false)
 	private List<PjpfFiles> filesList;
+
+	/**
+	 * 配送方式
+	 */
+	@ApiModelProperty(value = "配送方式")
+	private String shipType;
+	/**
+	 * 物流公司id
+	 */
+	@ApiModelProperty(value = "物流公司id")
+	private String logisticsCorpId;
+	/**
+	 * 物流公司名称
+	 */
+	@ApiModelProperty(value = "物流公司名称")
+	private String logisticsCorpName;
+	/**
+	 * 物流单号
+	 */
+	@ApiModelProperty(value = "物流单号")
+	private String expressNo;
 }

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/controller/TradingBoxFeesController.java

@@ -162,6 +162,7 @@ public class TradingBoxFeesController extends BladeController {
 			}
 			tradingBoxFees.setCreateUser(AuthUtil.getUserId());
 			tradingBoxFees.setCreateTime(new Date());
+			tradingBoxFees.setIdentifier(1);
 		} else {
 			tradingBoxFees.setUpdateTime(new Date());
 			tradingBoxFees.setUpdateUser(AuthUtil.getUserId());
@@ -183,6 +184,9 @@ public class TradingBoxFeesController extends BladeController {
 			if (ObjectUtils.isNotNull(tradingBoxFees) && !tradingBoxFees.getCreateUser().equals(AuthUtil.getUserId())) {
 				throw new RuntimeException("当前登录人没有删除该单据权限");
 			}
+			if (ObjectUtils.isNotNull(tradingBoxFees) && 0 == tradingBoxFees.getIdentifier()){
+				throw new RuntimeException("操作失败，无权限");
+			}
 		}
 		return R.status(tradingBoxFeesService.removeByIds(Func.toLongList(ids)));
 	}

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/mapper/TradingBoxFeesMapper.xml

@@ -26,6 +26,7 @@
         <result column="src_order_no" property="srcOrderNo"/>
         <result column="submit_pay" property="submitPay"/>
         <result column="src_type" property="srcType"/>
+        <result column="identifier" property="identifier"/>
     </resultMap>
     <update id="submitPay">
         UPDATE container_trading_box_fees SET submit_pay = '1' WHERE pid = #{id}

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/TradingBoxServiceImpl.java

@@ -938,7 +938,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			tradingBoxFees.setCode(tradingBoxItem.getCode());
 			tradingBoxFees.setCorpName(tradingBox.getPurchaseCompanyName());
 			//获取费用id
-			R<FeesDesc> fees = feesDescClient.getFeesByName("超期租金");
+			R<FeesDesc> fees = feesDescClient.getFeesByName("租金");
 			if (fees.isSuccess() && fees.getData() != null) {
 				tradingBoxFees.setItemId(fees.getData().getId());
 			}
@@ -959,6 +959,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			tradingBoxFees.setCreateTime(new Date());
 			tradingBoxFees.setTenantId(AuthUtil.getTenantId());
 			tradingBoxFees.setSubmitPay(0);
+			tradingBoxFees.setIdentifier(0);
 			tradingBoxFeesService.save(tradingBoxFees);
 			tradingBoxFeesList.add(tradingBoxFees);
 			tradingBoxItem.setOverdueAmount(tradingBoxItem.getPrice().multiply(BigDecimal.valueOf(days)));
@@ -988,8 +989,9 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			tradingBoxFeesLambdaQueryWrapper.eq(TradingBoxFees::getIsDeleted, 0);
 			tradingBoxFeesLambdaQueryWrapper.eq(TradingBoxFees::getPid, tradingBox.getId());
 			tradingBoxFeesLambdaQueryWrapper.eq(TradingBoxFees::getTenantId, AuthUtil.getTenantId());
-			tradingBoxFeesLambdaQueryWrapper.eq(TradingBoxFees::getSubmitPay, 1);
+//			tradingBoxFeesLambdaQueryWrapper.eq(TradingBoxFees::getSubmitPay, 1);
 			tradingBoxFeesLambdaQueryWrapper.eq(TradingBoxFees::getCode, tradingBoxItem.getCode());
+			tradingBoxFeesLambdaQueryWrapper.eq(TradingBoxFees::getIdentifier, 0);
 			tradingBoxFeesLambdaQueryWrapper.orderByDesc(TradingBoxFees::getCreateTime);
 			List<TradingBoxFees> tradingBoxFeesList = tradingBoxFeesService.list(tradingBoxFeesLambdaQueryWrapper);
 			if (tradingBoxFeesList.size() > 1) {

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/service/impl/ShipServiceImpl.java

@@ -547,6 +547,10 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 			if ("已收货".equals(order.getStatus()) || "退款请核".equals(order.getStatus()) || "已取消".equals(order.getStatus())) {
 				throw new RuntimeException("单据已收货或申请售后中，操作失败");
 			}
+			order.setShipType(ship.getShipType());
+			order.setLogisticsCorpId(ship.getLogisticsCorpId());
+			order.setLogisticsCorpName(ship.getLogisticsCorpName());
+			order.setExpressNo(ship.getExpressNo());
 			if (goodsNum.compareTo(sendNum) == 0) {//数量等于发货数量修改销售订单状态
 				order.setStatus(OrderTypeEnum.SHIPED.getType());
 				order.setXcxStatus(OrderTypeEnum.GOODSRECEIVED.getType());