陆运修改

Signed-off-by: sunhz <mpcoo@foxmail.com>

blade-service-api/blade-land-api/src/main/java/org/springblade/land/vo/OrderAcctVO.java

@@ -54,10 +54,14 @@ public class OrderAcctVO {
 
 	private BigDecimal extraAmountC;
 
+	private String extraAmountItemC;
+
 	private BigDecimal landAmountD;
 
 	private BigDecimal extraAmountD;
 
+	private String extraAmountItemD;
+
 	private String remarks;
 
 	private Integer status;

blade-service/blade-land/src/main/java/org/springblade/land/mapper/OrderFeeMapper.xml

@@ -39,6 +39,7 @@
         <where>
             t1.kind = 2
             and t1.is_deleted = 0
+            and t1.fleet_id is not null
             <if test="orderId != null">and t1.order_id = #{orderId}</if>
         </where>
     </select>

blade-service/blade-land/src/main/java/org/springblade/land/service/impl/OrderAddressServiceImpl.java

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
+import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.land.entity.Order;
 import org.springblade.land.entity.OrderAddress;
@@ -68,23 +69,25 @@ public class OrderAddressServiceImpl extends ServiceImpl<OrderAddressMapper, Ord
 			int i = 1;
 			StringBuilder addressDetail = new StringBuilder();
 			for (OrderAddress address : addressList) {
-				if (StringUtil.isNotBlank(address.getCorpName())) {
+				if (ObjectUtil.isNotEmpty(address.getCorpId()) && StringUtil.isNotBlank(address.getCorpName())) {
 					addressDetail.append(i).append(".").append(address.getCorpName()).append("(");
+				} else {
+					addressDetail.append(i).append(".").append("(");
+				}
 
-					if (StringUtil.isNotBlank(address.getContacts())) {
-						addressDetail.append(address.getContacts());
-					}
-					if (StringUtil.isNotBlank(address.getTel())) {
-						addressDetail.append(" ").append(address.getTel());
-					}
-					if (StringUtil.isNotBlank(address.getAddress())) {
-						addressDetail.append(") ").append(address.getAddress()).append("\n");
-					} else {
-						addressDetail.append(") ").append("\n");
-					}
-
-					i ++;
+				if (StringUtil.isNotBlank(address.getContacts())) {
+					addressDetail.append(address.getContacts());
+				}
+				if (StringUtil.isNotBlank(address.getTel())) {
+					addressDetail.append(" ").append(address.getTel());
 				}
+				if (StringUtil.isNotBlank(address.getAddress())) {
+					addressDetail.append(") ").append(address.getAddress()).append("\n");
+				} else {
+					addressDetail.append(") ").append("\n");
+				}
+
+				i++;
 			}
 
 			Order order = new Order();

blade-service/blade-land/src/main/java/org/springblade/land/service/impl/OrderServiceImpl.java

@@ -706,8 +706,27 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				.eq(OrderFee::getIsDeleted, 0)
 			);
 
+			StringBuilder extraAmountItemD = new StringBuilder();
+			StringBuilder extraAmountItemC = new StringBuilder();
+			for (OrderFee fee : feeList) {
+				if (!ObjectUtil.isEmpty(fee.getFeeId())) {
+					R<FeesDesc> feesMessage = feesDescClient.detail(fee.getFeeId());
+					if (feesMessage.isSuccess() && feesMessage.getData() != null) {
+						fee.setFeeName(feesMessage.getData().getCname());
+					}
+
+					if (fee.getType() == 1) {
+						extraAmountItemD.append(fee.getFeeName()).append("：").append(fee.getAmount()).append("\n");
+					} else {
+						extraAmountItemC.append(fee.getFeeName()).append("：").append(fee.getAmount()).append("\n");
+					}
+				}
+			}
+
 			acct.setExtraAmountD(feeList.stream().filter(e -> e.getType() == 1).reduce(BigDecimal.ZERO, (x, y) -> x.add(y.getAmount()), BigDecimal::add));
+			acct.setExtraAmountItemD(extraAmountItemD.toString());
 			acct.setExtraAmountC(feeList.stream().filter(e -> e.getType() == 2).reduce(BigDecimal.ZERO, (x, y) -> x.add(y.getAmount()), BigDecimal::add));
+			acct.setExtraAmountItemC(extraAmountItemC.toString());
 			acct.setProfit(acct.getLandAmountD().add(acct.getExtraAmountD()).subtract(acct.getLandAmountC()).subtract(acct.getExtraAmountC()));
 			if (feeList.stream().anyMatch(e -> e.getConfirmStatus() == 1)) {
 				acct.setConfirmStatus(1);
@@ -778,23 +797,25 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				orderAddressMapper.updateById(address);
 			}
 
-			if (StringUtil.isNotBlank(address.getCorpName())) {
+			if (ObjectUtil.isNotEmpty(address.getCorpId()) && StringUtil.isNotBlank(address.getCorpName())) {
 				addressDetail.append(i).append(".").append(address.getCorpName()).append("(");
+			} else {
+				addressDetail.append(i).append(".").append("(");
+			}
 
-				if (StringUtil.isNotBlank(address.getContacts())) {
-					addressDetail.append(address.getContacts());
-				}
-				if (StringUtil.isNotBlank(address.getTel())) {
-					addressDetail.append(" ").append(address.getTel());
-				}
-				if (StringUtil.isNotBlank(address.getAddress())) {
-					addressDetail.append(") ").append(address.getAddress()).append("\n");
-				} else {
-					addressDetail.append(") ").append("\n");
-				}
-
-				i ++;
+			if (StringUtil.isNotBlank(address.getContacts())) {
+				addressDetail.append(address.getContacts());
 			}
+			if (StringUtil.isNotBlank(address.getTel())) {
+				addressDetail.append(" ").append(address.getTel());
+			}
+			if (StringUtil.isNotBlank(address.getAddress())) {
+				addressDetail.append(") ").append(address.getAddress()).append("\n");
+			} else {
+				addressDetail.append(") ").append("\n");
+			}
+
+			i++;
 		}
 
 		List<CommonFile> fileList = order.getFileList();