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

blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/reports/entity/Reports.java

@@ -190,5 +190,16 @@ public class Reports implements Serializable {
 	@ApiModelProperty(value = "授权团队id")
 	private String authorizedTeamId;
 
+	/**
+	 * 排除用户
+	 */
+	@ApiModelProperty(value = "排除用户")
+	private String excludeUsers;
+	/**
+	 * 排除用户id
+	 */
+	@ApiModelProperty(value = "排除用户")
+	private String excludeUsersId;
+
 
 }

blade-service-api/blade-los-api/src/main/java/org/springblade/los/edi/entity/EdiTypes.java

@@ -25,7 +25,6 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.List;
 
 /**
  * 基础资料-EDI 类型表实体类
@@ -155,7 +154,7 @@ public class EdiTypes implements Serializable {
 	/**
 	 * 是否已删除（0 否 1是）
 	 */
-	@TableLogic(value = "0",delval = "1")
+	@TableLogic(value = "0", delval = "1")
 	@ApiModelProperty(value = "是否已删除（0 否 1是）")
 	private Integer isDeleted;
 
@@ -201,5 +200,11 @@ public class EdiTypes implements Serializable {
 	@ApiModelProperty(value = "JSON 对象数组，权限团队")
 	private String teamlist;
 
+	/**
+	 * JJSON 对象数组，排除用户
+	 */
+	@ApiModelProperty(value = "JSON 对象数组，排除用户")
+	private String excludelist;
+
 
 }

blade-service-api/blade-los-api/src/main/java/org/springblade/los/trade/report/AgentFeeReport.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.los.trade.report;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springblade.system.entity.Dept;
 
@@ -55,6 +56,10 @@ public class AgentFeeReport implements Serializable {
 	 */
 	private BigDecimal remainingAmount;
 	/**
+	 * 之前需补金额
+	 */
+	private BigDecimal beforeRepairAmount;
+	/**
 	 * 总计金额
 	 */
 	private BigDecimal sumAmount;
@@ -114,5 +119,45 @@ public class AgentFeeReport implements Serializable {
 	 */
 	private BigDecimal discountAmountSub;
 
+	/**
+	 * 贸易代理费
+	 */
+	private BigDecimal tradeAgencyAmount;
+
+	/**
+	 * 其他费用
+	 */
+	private BigDecimal otherAmount;
+
+	/**
+	 * 增值税
+	 */
+	private BigDecimal valueAddedTax;
+
+	/**
+	 * 关税
+	 */
+	private BigDecimal tariff;
+
+	/**
+	 * 实付贸易代理费
+	 */
+	private BigDecimal realityTradeAgencyAmount;
+
+	/**
+	 * 实付其他费用
+	 */
+	private BigDecimal realityOtherAmount;
+
+	/**
+	 * 实付增值税
+	 */
+	private BigDecimal realityValueAddedTax;
+
+	/**
+	 * 实付关税
+	 */
+	private BigDecimal realityTariff;
+
 
 }

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

@@ -317,7 +317,7 @@ public class PjProductLaunch implements Serializable {
 	/**
 	 * 商品编码
 	 */
-	@TableField(exist = false)
+	@ApiModelProperty(value = "商品编码")
 	private String code;
 
 	/**
@@ -348,4 +348,10 @@ public class PjProductLaunch implements Serializable {
 	private BigDecimal inventoryShare;
 	@TableField(exist = false)
 	private BigDecimal inventoryLocal;
+
+	/**
+	 * 商品描述
+	 */
+	@ApiModelProperty(value = "商品描述")
+	private String goodsDescription;
 }

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

@@ -102,6 +102,10 @@ public class ShoppingMallDetail implements Serializable {
 	 */
 	@TableField(exist = false)
 	private String cname;
+	/**
+	 * 商品描述
+	 */
+	private String goodsDescription;
 
 
 }

blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/controller/ReportsController.java

@@ -35,7 +35,6 @@ import org.springblade.los.Util.IDeptUtils;
 import org.springblade.los.basic.reports.entity.Reports;
 import org.springblade.los.basic.reports.service.IReportsService;
 import org.springblade.los.basic.reports.vo.ReportsVO;
-import org.springblade.los.business.sea.entity.Bills;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -88,7 +87,28 @@ public class ReportsController extends BladeController {
 			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(reports.getClassifyCode()), Reports::getClassifyCode, reports.getClassifyCode());
 		}
 		if (!AuthUtil.getUserRole().contains("admin")) {
-			lambdaQueryWrapper.apply("find_in_set('"+AuthUtil.getUserId()+"',authorized_users_id)");
+			String roleIds = AuthUtil.getUser().getRoleId();
+			StringBuilder text = new StringBuilder("(");
+			String[] arr = roleIds.split(",");
+			for (int i = 0; i < arr.length; i++) {
+				if (i + 1 == arr.length) {
+					text.append("find_in_set('").append(arr[i]).append("',authorized_role_id) or ");
+				} else {
+					text.append("find_in_set('").append(arr[i]).append("',authorized_role_id) or ");
+				}
+			}
+			String postIds = AuthUtil.getUser().getPostId();
+			String[] arrPost = postIds.split(",");
+			for (int i = 0; i < arrPost.length; i++) {
+				if (i + 1 == arrPost.length) {
+					text.append("find_in_set('").append(arrPost[i]).append("',authorized_team_id) or ");
+				} else {
+					text.append("find_in_set('").append(arrPost[i]).append("',authorized_team_id) or ");
+				}
+			}
+			text.append("find_in_set('").append(AuthUtil.getUserId()).append("',authorized_users_id))  ");
+			text.append("and not find_in_set('").append(AuthUtil.getUserId()).append("',exclude_users_id)");
+			lambdaQueryWrapper.apply(text.toString());
 		}
 		IPage<Reports> pages = reportsService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);

blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/service/impl/ReportsServiceImpl.java

@@ -1146,7 +1146,8 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						throw new RuntimeException("请先维护费用");
 					}
 					list.add(0, bills);
-				} else if (MagicValues.MH.equals(bills.getBillType())) {
+				}
+				else if (MagicValues.MH.equals(bills.getBillType())) {
 					// 分单
 					Bills details = billsService.getOne(new LambdaQueryWrapper<Bills>()
 						.eq(Bills::getId, bills.getMasterId())
@@ -1777,6 +1778,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				if (resDictBiz.isSuccess() && ObjectUtils.isNotNull(resDictBiz.getData())) {
 					bills.setHpaymode(resDictBiz.getData().getRemark());
 				}
+				R<DictBiz> resDictBizM = dictBizClient.getDictBiz("payment_method_los", bills.getMpaymode(), AuthUtil.getTenantId());
+				if (resDictBizM.isSuccess() && ObjectUtils.isNotNull(resDictBizM.getData())) {
+					bills.setMpaymode(resDictBizM.getData().getRemark());
+				}
 				R<DictBiz> resDictBiz1 = dictBizClient.getDictBiz("issue_type_F", bills.getIssueType(), AuthUtil.getTenantId());
 				if (resDictBiz1.isSuccess() && ObjectUtils.isNotNull(resDictBiz1.getData())) {
 					bills.setIssueType(resDictBiz1.getData().getRemark());
@@ -1942,6 +1947,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				if (resDictBiz.isSuccess() && ObjectUtils.isNotNull(resDictBiz.getData())) {
 					bills.setHpaymode(resDictBiz.getData().getRemark());
 				}
+				R<DictBiz> resDictBizM = dictBizClient.getDictBiz("payment_method_los", bills.getMpaymode(), AuthUtil.getTenantId());
+				if (resDictBizM.isSuccess() && ObjectUtils.isNotNull(resDictBizM.getData())) {
+					bills.setMpaymode(resDictBizM.getData().getRemark());
+				}
 				R<DictBiz> resDictBiz1 = dictBizClient.getDictBiz("issue_type_F", bills.getIssueType(), AuthUtil.getTenantId());
 				if (resDictBiz1.isSuccess() && ObjectUtils.isNotNull(resDictBiz1.getData())) {
 					bills.setIssueType(resDictBiz1.getData().getRemark());
@@ -2838,6 +2847,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 				if (resDictBiz.isSuccess() && ObjectUtils.isNotNull(resDictBiz.getData())) {
 					bills.setHpaymode(resDictBiz.getData().getRemark());
 				}
+				R<DictBiz> resDictBizM = dictBizClient.getDictBiz("payment_method_los", bills.getMpaymode(), AuthUtil.getTenantId());
+				if (resDictBizM.isSuccess() && ObjectUtils.isNotNull(resDictBizM.getData())) {
+					bills.setMpaymode(resDictBizM.getData().getRemark());
+				}
 				R<DictBiz> resDictBiz1 = dictBizClient.getDictBiz("issue_type_F", bills.getIssueType(), AuthUtil.getTenantId());
 				if (resDictBiz1.isSuccess() && ObjectUtils.isNotNull(resDictBiz1.getData())) {
 					bills.setIssueType(resDictBiz1.getData().getRemark());

blade-service/blade-los/src/main/java/org/springblade/los/edi/controller/EdiTypesController.java

@@ -80,7 +80,28 @@ public class EdiTypesController extends BladeController {
 			.eq(ObjectUtils.isNotNull(ediTypes.getType()), EdiTypes::getType, ediTypes.getType())
 		    .orderBy(true, true, EdiTypes::getCode);
 		if (!"admin".equals(AuthUtil.getUserName())) {
-			lambdaQueryWrapper.apply("find_in_set(" + deptUtils.getDeptPid()+"" + ",userlist)");
+			String roleIds = AuthUtil.getUser().getRoleId();
+			StringBuilder text = new StringBuilder("(");
+			String[] arr = roleIds.split(",");
+			for (int i = 0; i < arr.length; i++) {
+				if (i + 1 == arr.length) {
+					text.append("find_in_set('").append(arr[i]).append("',rolelist) or ");
+				} else {
+					text.append("find_in_set('").append(arr[i]).append("',rolelist) or ");
+				}
+			}
+			String postIds = AuthUtil.getUser().getPostId();
+			String[] arrPost = postIds.split(",");
+			for (int i = 0; i < arrPost.length; i++) {
+				if (i + 1 == arrPost.length) {
+					text.append("find_in_set('").append(arrPost[i]).append("',teamlist) or ");
+				} else {
+					text.append("find_in_set('").append(arrPost[i]).append("',teamlist) or ");
+				}
+			}
+			text.append("find_in_set('").append(AuthUtil.getUserId()).append("',userlist))  ");
+			text.append("and not find_in_set('").append(AuthUtil.getUserId()).append("',excludelist)");
+			lambdaQueryWrapper.apply(text.toString());
 		}
 		IPage<EdiTypes> pages = ediTypesService.page(Condition.getPage(query), Condition.getQueryWrapper(ediTypes));
 		return R.data(pages);

blade-service/blade-los/src/main/java/org/springblade/los/trade/service/impl/AgentServiceImpl.java

@@ -1889,7 +1889,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 		List<FinAccBills> finAccBills = new ArrayList<>();
 		List<FinStlBillsItems> stlBillsItemsList = new ArrayList<>();
 		List<FeeCenter> feeCenters1 = new ArrayList<>();
-		for (FeeCenter item : feeCenterList) {
+		for (FeeCenter item : feeCentersList) {
 			if (1 == item.getStlStatus()) {
 				throw new RuntimeException("费用：" + item.getFeeCnName() + "已确认");
 			}
@@ -3190,6 +3190,8 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 		}
 		stlAgent.setTradeAgencyAmount(tradeAgencyAmount);
 		stlAgent.setOtherAmount(otherAmount);
+		stlAgent.setValueAddedTax(valueAddedTax);
+		stlAgent.setTariff(tariff);
 		baseMapper.updateById(stlAgent);
 		feeCenterService.saveOrUpdateBatch(feeCenterList);
 		//给角色为财务的人发送消息
@@ -3471,7 +3473,7 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 					.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
 					.eq(FeeCenter::getIsDeleted, 0));
 				if (feeCenterList.isEmpty()) {
-					throw new RuntimeException("请先维护首款费用信息");
+					throw new RuntimeException("请先维护应收费用信息");
 				}
 				List<Long> ids = feeCenterList.stream().map(FeeCenter::getPid).filter(Objects::nonNull).collect(Collectors.toList());
 				List<FeeCenter> feeCenterListC = feeCenterService.list(new LambdaQueryWrapper<FeeCenter>()
@@ -3480,9 +3482,17 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 					.apply("stl_pid is not null")
 					.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
 					.eq(FeeCenter::getIsDeleted, 0));
-				if (feeCenterList.isEmpty()) {
-					throw new RuntimeException("请先维护首款费用信息");
+				if (feeCenterListC.isEmpty()) {
+					throw new RuntimeException("请先维护应付费用信息");
 				}
+				agentFeeReport.setRealityOtherAmount(feeCenterListC.stream().filter(e -> !"SXF,YDF,YFK,WK,SFK,DLF,ZZS,GS".contains(e.getFeeCode()))
+					.map(FeeCenter::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
+				agentFeeReport.setRealityTariff(feeCenterListC.stream().filter(e -> "GS".equals(e.getFeeCode()))
+					.map(FeeCenter::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
+				agentFeeReport.setRealityValueAddedTax(feeCenterListC.stream().filter(e -> "ZZS".equals(e.getFeeCode()))
+					.map(FeeCenter::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
+				agentFeeReport.setRealityTradeAgencyAmount(feeCenterListC.stream().filter(e -> "DLF".equals(e.getFeeCode()))
+					.map(FeeCenter::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
 				List<AgentRecordReport> reportList = new ArrayList<>();
 				List<FeeCenter> feeCentersSk = feeCenterList.stream().filter(e -> ObjectUtils.isNotNull(e.getFeeType()) &&
 						"1".equals(e.getFeeType()) && "SFK".equals(e.getFeeCode()))
@@ -3636,13 +3646,32 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 						agentFeeReport.setRealitySumAmount(realityAmount.add(agentFeeReport.getRealityPostElectricFee()).add(agentFeeReport.getRealityServiceCharge()));
 					}
 				}
+				BigDecimal remainingAmount = feeCenterList.stream().filter(e -> e.getFeeCode().equals("YFK")).map(FeeCenter::getAmount).filter(Objects::nonNull)
+					.reduce(BigDecimal.ZERO, BigDecimal::add);
+				if (new BigDecimal("0.00").compareTo(remainingAmount) < 0) {
+					agentFeeReport.setRemainingAmount(remainingAmount);
+					agentFeeReport.setBeforeRepairAmount(new BigDecimal("0.00"));
+				} else if (new BigDecimal("0.00").compareTo(remainingAmount) > 0) {
+					agentFeeReport.setRemainingAmount(new BigDecimal("0.00"));
+					agentFeeReport.setBeforeRepairAmount(remainingAmount.abs());
+				} else {
+					agentFeeReport.setRemainingAmount(new BigDecimal("0.00"));
+					agentFeeReport.setBeforeRepairAmount(new BigDecimal("0.00"));
+				}
+				agentFeeReport.setRealitySumAmount(agentFeeReport.getRealitySumAmount().add(agentFeeReport.getRealityOtherAmount())
+					.add(agentFeeReport.getRealityTariff()).add(agentFeeReport.getRealityTradeAgencyAmount())
+					.add(agentFeeReport.getRealityValueAddedTax()).add(agentFeeReport.getBeforeRepairAmount())
+					.subtract(agentFeeReport.getRemainingAmount()));
 				agentFeeReport.setPostElectricFee(agent.getPostElectricFee());
 				agentFeeReport.setServiceCharge(agent.getServiceCharge());
-				agentFeeReport.setSumAmount(agent.getActualAmount());
-				agentFeeReport.setRemainingAmount(feeCenterList.stream().filter(e -> e.getFeeCode().equals("YFK")).map(FeeCenter::getAmount).filter(Objects::nonNull)
-					.reduce(BigDecimal.ZERO, BigDecimal::add));
-				agentFeeReport.setRepairAmount(agentFeeReport.getRealitySumAmount().subtract(agentFeeReport.getSumAmount())
+				agentFeeReport.setOtherAmount(agent.getOtherAmount());
+				agentFeeReport.setTariff(agent.getTariff());
+				agentFeeReport.setValueAddedTax(agent.getValueAddedTax());
+				agentFeeReport.setTradeAgencyAmount(agent.getTradeAgencyAmount());
+				agentFeeReport.setSumAmount(agent.getActualAmount().add(agent.getOtherAmount()).add(agent.getTariff())
+					.add(agent.getValueAddedTax()).add(agent.getTradeAgencyAmount()).add(agentFeeReport.getBeforeRepairAmount())
 					.subtract(agentFeeReport.getRemainingAmount()));
+				agentFeeReport.setRepairAmount(agentFeeReport.getRealitySumAmount().subtract(agentFeeReport.getSumAmount()));
 				if (new BigDecimal("0.00").compareTo(agentFeeReport.getRepairAmount()) > 0) {
 					agentFeeReport.setSurplusAmount(agentFeeReport.getRepairAmount().abs());
 					agentFeeReport.setRepairAmount(agentFeeReport.getRepairAmount().abs());
@@ -3652,7 +3681,6 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 				}
 				agentFeeReport.setDate(dateFormat.format(agent.getBusinessDate()));
 				agentFeeReport.setPaymentMethod(agent.getAdvanceRatio());
-
 				agentFeeReport.setReportPostElectricFee(agentFeeReport.getRealityPostElectricFee());
 				BigDecimal discountAmount = reportList.stream().map(AgentRecordReport::getDiscountAmount)
 					.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -3762,6 +3790,14 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 						}
 					}
 				}
+				agentFeeReport.setRealityOtherAmount(feeCenterListC.stream().filter(e -> !"SXF,YDF,YFK,WK,SFK,DLF,ZZS,GS".contains(e.getFeeCode()))
+					.map(FeeCenter::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
+				agentFeeReport.setRealityTariff(feeCenterListC.stream().filter(e -> "GS".equals(e.getFeeCode()))
+					.map(FeeCenter::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
+				agentFeeReport.setRealityValueAddedTax(feeCenterListC.stream().filter(e -> "ZZS".equals(e.getFeeCode()))
+					.map(FeeCenter::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
+				agentFeeReport.setRealityTradeAgencyAmount(feeCenterListC.stream().filter(e -> "DLF".equals(e.getFeeCode()))
+					.map(FeeCenter::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
 				List<AgentRecordReport> reportList = new ArrayList<>();
 				List<FeeCenter> feeCentersSk = feeCenterList.stream().filter(e -> ObjectUtils.isNotNull(e.getFeeType()) &&
 						"1".equals(e.getFeeType()) && "SFK".equals(e.getFeeCode()))
@@ -3915,13 +3951,33 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 						agentFeeReport.setRealitySumAmount(realityAmount.add(agentFeeReport.getRealityPostElectricFee()).add(agentFeeReport.getRealityServiceCharge()));
 					}
 				}
+				BigDecimal remainingAmount = feeCenterList.stream().filter(e -> e.getFeeCode().equals("YFK")).map(FeeCenter::getAmount).filter(Objects::nonNull)
+					.reduce(BigDecimal.ZERO, BigDecimal::add);
+				agentFeeReport.setRemainingAmount(remainingAmount);
+				if (new BigDecimal("0.00").compareTo(remainingAmount) < 0) {
+					agentFeeReport.setRemainingAmount(remainingAmount);
+					agentFeeReport.setBeforeRepairAmount(new BigDecimal("0.00"));
+				} else if (new BigDecimal("0.00").compareTo(remainingAmount) > 0) {
+					agentFeeReport.setRemainingAmount(new BigDecimal("0.00"));
+					agentFeeReport.setBeforeRepairAmount(remainingAmount.abs());
+				} else {
+					agentFeeReport.setRemainingAmount(new BigDecimal("0.00"));
+					agentFeeReport.setBeforeRepairAmount(new BigDecimal("0.00"));
+				}
+				agentFeeReport.setRealitySumAmount(agentFeeReport.getRealitySumAmount().add(agentFeeReport.getRealityOtherAmount())
+					.add(agentFeeReport.getRealityTariff()).add(agentFeeReport.getRealityTradeAgencyAmount())
+					.add(agentFeeReport.getRealityValueAddedTax()).add(agentFeeReport.getBeforeRepairAmount())
+					.subtract(agentFeeReport.getRemainingAmount()));
 				agentFeeReport.setPostElectricFee(agent.getPostElectricFee());
 				agentFeeReport.setServiceCharge(agent.getServiceCharge());
-				agentFeeReport.setSumAmount(agent.getActualAmount());
-				agentFeeReport.setRemainingAmount(feeCenterList.stream().filter(e -> e.getFeeCode().equals("YFK")).map(FeeCenter::getAmount).filter(Objects::nonNull)
-					.reduce(BigDecimal.ZERO, BigDecimal::add));
-				agentFeeReport.setRepairAmount(agentFeeReport.getRealitySumAmount().subtract(agentFeeReport.getSumAmount())
+				agentFeeReport.setOtherAmount(agent.getOtherAmount());
+				agentFeeReport.setTariff(agent.getTariff());
+				agentFeeReport.setValueAddedTax(agent.getValueAddedTax());
+				agentFeeReport.setTradeAgencyAmount(agent.getTradeAgencyAmount());
+				agentFeeReport.setSumAmount(agent.getActualAmount().add(agent.getOtherAmount()).add(agent.getTariff())
+					.add(agent.getValueAddedTax()).add(agent.getTradeAgencyAmount()).add(agentFeeReport.getBeforeRepairAmount())
 					.subtract(agentFeeReport.getRemainingAmount()));
+				agentFeeReport.setRepairAmount(agentFeeReport.getRealitySumAmount().subtract(agentFeeReport.getSumAmount()));
 				if (new BigDecimal("0.00").compareTo(agentFeeReport.getRepairAmount()) > 0) {
 					agentFeeReport.setSurplusAmount(agentFeeReport.getRepairAmount().abs());
 					agentFeeReport.setRepairAmount(agentFeeReport.getRepairAmount().abs());

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/service/impl/GoodsDescServiceImpl.java

@@ -219,6 +219,8 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, PjGoodsDe
 			productLaunch.setBrandItem(goodsDesc.getBrandItem());
 			productLaunch.setPlaceProduction(goodsDesc.getPlaceProduction());
 			productLaunch.setCnameInt(goodsDesc.getCnameInt());
+			productLaunch.setCode(goodsDesc.getCode());
+			productLaunch.setGoodsDescription(goodsDesc.getGoodsDescription());
 			productLaunch.setExplosionProof(goodsDesc.getExplosionProof());
 			productLaunch.setOriginalFactory(goodsDesc.getOriginalFactory());
 			productLaunch.setSelfRecovery(goodsDesc.getSelfRecovery());

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

@@ -205,6 +205,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 	 */
 	@Override
 	public PjOrder getMessageById(PjOrder order) {
+		if (ObjectUtils.isNull(order.getId())){
+			throw new RuntimeException("缺少必要参数");
+		}
 		PjOrder detail = baseMapper.selectById(order.getId());
 
 		//获得销售明细

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/productLaunch/service/impl/ProductLaunchServiceImpl.java

@@ -296,6 +296,8 @@ public class ProductLaunchServiceImpl extends ServiceImpl<ProductLaunchMapper, P
 				productLaunch.setBrandId(pjGoodsDesc.getBrandId());
 				productLaunch.setBrandName(pjGoodsDesc.getBrandName());
 				productLaunch.setBrandItem(pjGoodsDesc.getBrandItem());
+				productLaunch.setCode(pjGoodsDesc.getCode());
+				productLaunch.setGoodsDescription(pjGoodsDesc.getGoodsDescription());
 				productLaunch.setPlaceProduction(pjGoodsDesc.getPlaceProduction());
 				productLaunch.setExplosionProof(pjGoodsDesc.getExplosionProof());
 				productLaunch.setOriginalFactory(pjGoodsDesc.getOriginalFactory());
@@ -724,6 +726,8 @@ public class ProductLaunchServiceImpl extends ServiceImpl<ProductLaunchMapper, P
 				productLaunch.setBrandId(pjGoodsDesc.getBrandId());
 				productLaunch.setBrandName(pjGoodsDesc.getBrandName());
 				productLaunch.setBrandItem(pjGoodsDesc.getBrandItem());
+				productLaunch.setCode(pjGoodsDesc.getCode());
+				productLaunch.setGoodsDescription(pjGoodsDesc.getGoodsDescription());
 				productLaunch.setPlaceProduction(pjGoodsDesc.getPlaceProduction());
 				productLaunch.setExplosionProof(pjGoodsDesc.getExplosionProof());
 				productLaunch.setOriginalFactory(pjGoodsDesc.getOriginalFactory());
@@ -953,6 +957,8 @@ public class ProductLaunchServiceImpl extends ServiceImpl<ProductLaunchMapper, P
 				productLaunch.setBrandId(pjGoodsDesc.getBrandId());
 				productLaunch.setBrandName(pjGoodsDesc.getBrandName());
 				productLaunch.setBrandItem(pjGoodsDesc.getBrandItem());
+				productLaunch.setCode(pjGoodsDesc.getCode());
+				productLaunch.setGoodsDescription(pjGoodsDesc.getGoodsDescription());
 				productLaunch.setPlaceProduction(pjGoodsDesc.getPlaceProduction());
 				productLaunch.setExplosionProof(pjGoodsDesc.getExplosionProof());
 				productLaunch.setOriginalFactory(pjGoodsDesc.getOriginalFactory());
@@ -1087,6 +1093,8 @@ public class ProductLaunchServiceImpl extends ServiceImpl<ProductLaunchMapper, P
 				productLaunch.setBrandId(pjGoodsDesc.getBrandId());
 				productLaunch.setBrandName(pjGoodsDesc.getBrandName());
 				productLaunch.setBrandItem(pjGoodsDesc.getBrandItem());
+				productLaunch.setCode(pjGoodsDesc.getCode());
+				productLaunch.setGoodsDescription(pjGoodsDesc.getGoodsDescription());
 				productLaunch.setPlaceProduction(pjGoodsDesc.getPlaceProduction());
 				productLaunch.setExplosionProof(pjGoodsDesc.getExplosionProof());
 				productLaunch.setOriginalFactory(pjGoodsDesc.getOriginalFactory());