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

blade-service/blade-los/src/main/java/org/springblade/los/business/update/service/impl/UpdateServiceImpl.java

@@ -673,8 +673,15 @@ public class UpdateServiceImpl extends ServiceImpl<UpdateMapper, Update> impleme
 				Field fieldId = bills.getClass().getDeclaredField(item.getField());
 				fieldId.setAccessible(true); // 使私有字段可访问
 				fieldId.set(bills, item.getFieldValueNew());
+			} else if ("客服".equals(item.getQueryType())) {
+				R<User> res = userClient.userInfoById(Long.parseLong(item.getFieldValueNew()));
+				if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
+					user = res.getData();
+					assignmentCustomerService(bills, user, item.getMainFieldId(), "1");
+					assignmentCustomerService(bills, user, item.getMainFieldId(), "3");
+				}
 			}
-		} else if ("日期选择器".equals(item.getFieldValueType())){
+		} else if ("日期选择器".equals(item.getFieldValueType())) {
 			Field fieldId = bills.getClass().getDeclaredField(item.getField());
 			fieldId.setAccessible(true); // 使私有字段可访问
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -1287,7 +1294,7 @@ public class UpdateServiceImpl extends ServiceImpl<UpdateMapper, Update> impleme
 					fieldId.setAccessible(true); // 使私有字段可访问
 					fieldId.set(amends, item.getFieldValueNew());
 				}
-			} else if ("日期选择器".equals(item.getFieldValueType())){
+			} else if ("日期选择器".equals(item.getFieldValueType())) {
 				Field fieldId = amends.getClass().getDeclaredField(item.getField());
 				fieldId.setAccessible(true); // 使私有字段可访问
 				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -1297,7 +1304,7 @@ public class UpdateServiceImpl extends ServiceImpl<UpdateMapper, Update> impleme
 				} catch (ParseException e) {
 					e.printStackTrace();
 				}
-			}else {
+			} else {
 				if (ObjectUtils.isNotNull(item.getAmendsFieldCname())) {
 					Field fieldId = amends.getClass().getDeclaredField(item.getAmendsFieldCname());
 					fieldId.setAccessible(true); // 使私有字段可访问
@@ -1469,20 +1476,20 @@ public class UpdateServiceImpl extends ServiceImpl<UpdateMapper, Update> impleme
 					fieldId.setAccessible(true); // 使私有字段可访问
 					fieldId.set(feeCenter, item.getFieldValueNew());
 				}
-			} else if ("日期选择器".equals(item.getFieldValueType())){
+			} else if ("日期选择器".equals(item.getFieldValueType())) {
 				Field fieldId = feeCenter.getClass().getDeclaredField(item.getField());
 				fieldId.setAccessible(true); // 使私有字段可访问
 				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 				try {
 					Date date = sdf.parse(item.getFieldValueNew());
 					fieldId.set(feeCenter, date);
-					if ("etd,eta".contains(item.getField())){
+					if ("etd,eta".contains(item.getField())) {
 						feeCenter.setBillDate(date);
 					}
 				} catch (ParseException e) {
 					e.printStackTrace();
 				}
-			}else {
+			} else {
 				if (ObjectUtils.isNotNull(item.getFeeCenterFieldCname())) {
 					Field fieldId = feeCenter.getClass().getDeclaredField(item.getFeeCenterFieldCname());
 					fieldId.setAccessible(true); // 使私有字段可访问
@@ -1655,21 +1662,21 @@ public class UpdateServiceImpl extends ServiceImpl<UpdateMapper, Update> impleme
 					fieldId.setAccessible(true); // 使私有字段可访问
 					fieldId.set(accBills, item.getFieldValueNew());
 				}
-			} else if ("日期选择器".equals(item.getFieldValueType())){
+			} else if ("日期选择器".equals(item.getFieldValueType())) {
 				Field fieldId = accBills.getClass().getDeclaredField(item.getField());
 				fieldId.setAccessible(true); // 使私有字段可访问
 				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 				try {
 					Date date = sdf.parse(item.getFieldValueNew());
 					fieldId.set(accBills, date);
-					if ("etd,eta".contains(item.getField())){
+					if ("etd,eta".contains(item.getField())) {
 						accBills.setBillDate(date);
 						accBills.setBusinessDate(date);
 					}
 				} catch (ParseException e) {
 					e.printStackTrace();
 				}
-			}else {
+			} else {
 				if (ObjectUtils.isNotNull(item.getFinAccBillsFieldCname())) {
 					Field fieldId = accBills.getClass().getDeclaredField(item.getFinAccBillsFieldCname());
 					fieldId.setAccessible(true); // 使私有字段可访问
@@ -3014,6 +3021,29 @@ public class UpdateServiceImpl extends ServiceImpl<UpdateMapper, Update> impleme
 
 	}
 
+	/**
+	 * 重新赋值主表客服字段值
+	 *
+	 * @param bCorps    客服
+	 * @param mainField 赋值字段
+	 */
+	private Object assignmentCustomerService(Bills bills, User bCorps, String mainField, String fieldType) throws Exception {
+		if (ObjectUtils.isNull(mainField)) {
+			return null;
+		}
+		//判断要修改的表
+		Field fieldId = bills.getClass().getDeclaredField(mainField);
+		fieldId.setAccessible(true); // 使私有字段可访问
+		if ("1".equals(fieldType)) {
+			fieldId.set(bills, bCorps.getId());
+		} else if ("3".equals(fieldType)) {
+			fieldId.set(bills, bCorps.getRealName());
+		} else if ("4".equals(fieldType)) {
+			fieldId.set(bills, bCorps.getRealName());
+		}
+		return bills;
+	}
+
 
 	@Override
 	public R underReview(Long id) {

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/export/ExportOrderController.java

@@ -1692,6 +1692,9 @@ public class ExportOrderController extends BladeController {
 		order1.setOrderNo(null);
 		order1.setSrcOrderNo(null);
 		order1.setSrcId(null);
+		order1.setBusinesDate(new Date());
+		order1.setShipName("");
+		order1.setVoyage("");
 		order1.setOrderAmount(new BigDecimal("0.00"));
 		order1.setOtherAmount(new BigDecimal("0.00"));
 		order1.setDebitAmount(new BigDecimal("0.00"));

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -3109,10 +3109,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 							&& ObjectUtils.isNull(e.getDot())).findFirst().orElse(null);
 				}
 				if (stockOne != null) {
-					item.setRedeemNum(new BigDecimal("0"));
 					stockOne.setBalanceQuantityHave(stockOne.getBalanceQuantityHave().subtract(item.getRedeemNum()));
 					stockOne.setBalanceQuantityFinancing(stockOne.getBalanceQuantityFinancing().add(item.getRedeemNum()));
 					stockOne.setVersion(stockOne.getVersion());
+					item.setRedeemNum(new BigDecimal("0"));
 					pjStockDescArrayList.add(stockOne);
 				} else {
 					throw new RuntimeException("商品：" + goodsDesc.getCname() + "未查到库存账");