Merge remote-tracking branch 'origin/dev' into dev

blade-service-api/blade-land-api/src/main/java/org/springblade/land/excel/CdAcctExcel.java

@@ -19,18 +19,15 @@ public class CdAcctExcel implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
-	@ExcelProperty("客户名称")
-	private String corpName;
-
-	@ExcelProperty("客户简称")
-	private String corpShortName;
-
 	@ExcelProperty("货运日期")
-	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat("yyyy-MM-dd HH:mm")
 	private Date arrivalTime;
 
-	@ExcelProperty("业务员")
-	private String salesmanName;
+	@ExcelProperty("物流运输")
+	private String dispatchDeptName;
+
+	@ExcelProperty("运输调度")
+	private String dispatcherName;
 
 	@ExcelProperty("货运地点")
 	private String addressDetail;
@@ -48,21 +45,18 @@ public class CdAcctExcel implements Serializable {
 	private String ctnDetail;
 
 	@ExcelProperty("车队")
-	private String fleetName;
-
-	@ExcelProperty("车队简称")
 	private String fleetShortName;
 
 	@ExcelProperty("车号")
 	private String plateNo;
 
-	@ExcelProperty("运费")
+	@ExcelProperty("应付运费")
 	private BigDecimal landAmountC;
 
-	@ExcelProperty("杂费")
+	@ExcelProperty("应付杂费")
 	private BigDecimal extraAmountC;
 
-	@ExcelProperty("杂费明细")
+	@ExcelProperty("应付杂费明细")
 	private String extraAmountItemC;
 
 	@ExcelProperty("备注")

blade-service-api/blade-land-api/src/main/java/org/springblade/land/excel/KhAcctExcel.java

@@ -20,18 +20,18 @@ public class KhAcctExcel implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@ExcelProperty("客户名称")
-	private String corpName;
-
-	@ExcelProperty("客户简称")
 	private String corpShortName;
 
 	@ExcelProperty("货运日期")
-	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat("yyyy-MM-dd HH:mm")
 	private Date arrivalTime;
 
 	@ExcelProperty("业务员")
 	private String salesmanName;
 
+	@ExcelProperty("物流运输")
+	private String dispatchDeptName;
+
 	@ExcelProperty("货运地点")
 	private String addressDetail;
 
@@ -48,21 +48,18 @@ public class KhAcctExcel implements Serializable {
 	private String ctnDetail;
 
 	@ExcelProperty("车队")
-	private String fleetName;
-
-	@ExcelProperty("车队简称")
 	private String fleetShortName;
 
 	@ExcelProperty("车号")
 	private String plateNo;
 
-	@ExcelProperty("运费")
+	@ExcelProperty("应收运费")
 	private BigDecimal landAmountD;
 
-	@ExcelProperty("杂费")
+	@ExcelProperty("应收杂费")
 	private BigDecimal extraAmountD;
 
-	@ExcelProperty("杂费明细")
+	@ExcelProperty("应收杂费明细")
 	private String extraAmountItemD;
 
 	@ExcelProperty("备注")

blade-service-api/blade-land-api/src/main/java/org/springblade/land/excel/PtAcctExcel.java

@@ -20,18 +20,21 @@ public class PtAcctExcel implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@ExcelProperty("客户名称")
-	private String corpName;
-
-	@ExcelProperty("客户简称")
 	private String corpShortName;
 
 	@ExcelProperty("货运日期")
-	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat("yyyy-MM-dd HH:mm")
 	private Date arrivalTime;
 
 	@ExcelProperty("业务员")
 	private String salesmanName;
 
+	@ExcelProperty("运输调度")
+	private String dispatcherName;
+
+	@ExcelProperty("物流运输")
+	private String dispatchDeptName;
+
 	@ExcelProperty("货运地点")
 	private String addressDetail;
 
@@ -48,9 +51,6 @@ public class PtAcctExcel implements Serializable {
 	private String ctnDetail;
 
 	@ExcelProperty("车队")
-	private String fleetName;
-
-	@ExcelProperty("车队简称")
 	private String fleetShortName;
 
 	@ExcelProperty("车号")

blade-service-api/blade-mocha-item-api/src/main/java/org/springblade/mocha/entity/SalesPolicyItem.java

@@ -200,4 +200,7 @@ public class SalesPolicyItem implements Serializable {
 	@ApiModelProperty(value = "箱重量")
 	private BigDecimal cartonWeight;
 
+	@TableField(exist = false)
+	private Integer isSpecial;
+
 }

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/OrderItems.java

@@ -497,4 +497,9 @@ public class OrderItems implements Serializable {
 	 */
 	@ApiModelProperty(value = "箱重量")
 	private BigDecimal cartonWeight;
+	/**
+	 * 是否特价
+	 */
+	@ApiModelProperty(value = "是否特价")
+	private Integer isSpecial;
 }

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

@@ -149,18 +149,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					detail.setAgentName(agent.getData().getCname());
 				}
 			}
-			if (!ObjectUtil.isEmpty(detail.getAgentId())) {
-				R<CorpsDesc> agent = corpsDescClient.getCorpMessage(detail.getAgentId());
-				if (agent.isSuccess() && agent.getData() != null) {
-					detail.setAgentName(agent.getData().getCname());
-				}
-			}
-			if (!ObjectUtil.isEmpty(detail.getPolId())) {
-				BasicPortDesc pol = portClient.getPort(detail.getPolId());
-				if (pol != null) {
-					detail.setPolName(pol.getName());
-				}
-			}
 			if (!ObjectUtil.isEmpty(detail.getPodId())) {
 				BasicPortDesc pod = portClient.getPort(detail.getPodId());
 				if (pod != null) {

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/service/impl/SalesPolicyServiceImpl.java

@@ -162,6 +162,7 @@ public class SalesPolicyServiceImpl extends ServiceImpl<SalesPolicyMapper, Sales
 				if (StringUtils.isNotBlank(updateName)) {
 					item.setUpdateUserName(updateName);
 				}
+				item.setIsSpecial("特价".equals(policy.getType()) ? 1 : 0);
 			});
 			policy.setSpecialItemList(specialItemList);
 		}
@@ -177,6 +178,7 @@ public class SalesPolicyServiceImpl extends ServiceImpl<SalesPolicyMapper, Sales
 				if (StringUtils.isNotBlank(updateName)) {
 					item.setUpdateUserName(updateName);
 				}
+				item.setIsSpecial("特价".equals(policy.getType()) ? 1 : 0);
 			});
 			policy.setPresentItemList(presentItemList);
 		}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderItemsServiceImpl.java

@@ -584,47 +584,43 @@ public class OrderItemsServiceImpl extends ServiceImpl<OrderItemsMapper, OrderIt
 	}
 
 	@Override
-	public R<Map<String,Object>> importPolicy(List<PolicyExcel> data, Boolean isCovered,Long policyName,String salesType) {
-		Map<String,Object> map = new HashMap<>();
-		//查找政策
+	public R<Map<String, Object>> importPolicy(List<PolicyExcel> data, Boolean isCovered, Long policyName, String salesType) {
+		Map<String, Object> map = new HashMap<>();
+		// 查找政策
 		SalesPolicy policy = salesPolicyClient.getPolicy(policyName);
-		if (policy == null){
+		if (policy == null) {
 			throw new SecurityException("未找到政策信息");
 		}
-		StringBuffer stringBuffer = new StringBuffer();//导入失败的商品
+		// 导入失败的商品
+		StringBuilder stringBuffer = new StringBuilder();
 		List<SalesPolicyItem> list = new ArrayList<>();
-		//根据商品编码和主政策id查政策明细
-		for(int i=0;i<data.size();i++)
-		{
-			PolicyExcel policyExcel = data.get(i);
-			if (StringUtils.isBlank(policyExcel.getCode())){
-				stringBuffer.append(policyExcel.getCode()+",");
+		// 根据商品编码和主政策id查政策明细
+		for (PolicyExcel policyExcel : data) {
+			if (StringUtils.isBlank(policyExcel.getCode())) {
+				stringBuffer.append(policyExcel.getCode()).append(",");
 				continue;
 			}
-			if (policyExcel.getOrderQuantity() == null){
+			if (policyExcel.getOrderQuantity() == null) {
 				policyExcel.setOrderQuantity(BigDecimal.ZERO);
 			}
-			SalesPolicyItem policyItem = salesPolicyClient.getPolicyItem(policyExcel.getCode(), policy.getId(),salesType);
-			if (policyItem == null){
-				stringBuffer.append(policyExcel.getCode()+",");
+			SalesPolicyItem policyItem = salesPolicyClient.getPolicyItem(policyExcel.getCode(), policy.getId(), salesType);
+			if (policyItem == null) {
+				stringBuffer.append(policyExcel.getCode()).append(",");
 				continue;
 			}
+			policyItem.setIsSpecial("特价".equals(policy.getType()) ? 1 : 0);
 			policyItem.setOrderQuantity(policyExcel.getOrderQuantity());
 			list.add(policyItem);
 		}
-		map.put("list",list);
-		map.put("message",stringBuffer.toString());
+		map.put("list", list);
+		map.put("message", stringBuffer.toString());
 		return R.data(map);
 	}
 
 	@Override
 	public boolean submitPay(Long id) {
 		Integer integer = baseMapper.submitPay(id);
-		if (integer != null && integer >0){
-			return true;
-		}else {
-			return false;
-		}
+		return integer != null && integer > 0;
 	}
 
 }