2025年2月17日08:31:54

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

@@ -814,7 +814,7 @@ public class OrderItems implements Serializable {
 	/**
 	 * 商品名称
 	 */
-	@TableField(exist = false)
+	@ApiModelProperty(value = "商品名称")
 	private String goodsName;
 
 	/**

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/entity/OrderItems.java

@@ -463,7 +463,10 @@ public class OrderItems extends OrderBase {
 	@ApiModelProperty(value = "生成货款")
 	private Integer submitPay;
 
-	@TableField(exist = false)
+	/**
+	 * 商品名称
+	 */
+	@ApiModelProperty(value = "商品名称")
 	private String goodsName;
 
 	@TableField(exist = false)

blade-service/blade-los/src/main/java/org/springblade/los/Util/Regular_ONE.java

@@ -200,7 +200,7 @@ public class Regular_ONE {
 			}
 		}
 		//目的地代码
-		if (ObjectUtils.isNull(ediData.getPlaceDestinationCode())) {
+		/*if (ObjectUtils.isNull(ediData.getPlaceDestinationCode())) {
 			msg += "目的地代码,";
 		} else {
 			Map<String, String> mapString = RegularUtils.regularEn(ediData.getPlaceDestinationCode(),true);
@@ -209,9 +209,9 @@ public class Regular_ONE {
 			} else {
 				character += "目的地代码,";
 			}
-		}
+		}*/
 		//目的地
-		if (ObjectUtils.isNull(ediData.getPlaceDestinationName())) {
+		/*if (ObjectUtils.isNull(ediData.getPlaceDestinationName())) {
 			msg += "目的地,";
 		} else {
 			Map<String, String> mapString = RegularUtils.regularEn(ediData.getPlaceDestinationName(),true);
@@ -224,7 +224,7 @@ public class Regular_ONE {
 			} else {
 				character += "目的地,";
 			}
-		}
+		}*/
 
 		String text = "";
 		if (ObjectUtils.isNotNull(ediData.getBookingRemarks())) {

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/controller/TradeBillsController.java

@@ -90,21 +90,6 @@ public class TradeBillsController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入bills")
 	public R<IPage<Bills>> listTrade(Bills bills, Query query) {
 		LambdaQueryWrapper<Bills> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-		/*lambdaQueryWrapper.select(Bills::getId, Bills::getBillNo, Bills::getBillType, Bills::getMasterBillNo,
-			Bills::getCorpCnName, Bills::getCorpId, Bills::getCorpEnName, Bills::getVesselCnName,
-			Bills::getVesselId, Bills::getVoyageNo, Bills::getMblno, Bills::getHblno, Bills::getEta, Bills::getEtd,
-			Bills::getPolEnName, Bills::getPolId, Bills::getPodEnName, Bills::getPodId, Bills::getLoadType, Bills::getPlaceReceiptName,
-			Bills::getCargoType, Bills::getMarks, Bills::getQuantity, Bills::getGrossWeight, Bills::getNetWeight,
-			Bills::getMeasurement, Bills::getQuantityV20, Bills::getQuantityV40, Bills::getQuantityV40hc, Bills::getQuantityV45,
-			Bills::getQuantityV48, Bills::getIsNeedLand, Bills::getIsNeedDeclare, Bills::getIsNeedIq, Bills::getAmountDr,
-			Bills::getAmountCr, Bills::getAmountProfit, Bills::getAmountDrUsd, Bills::getAmountCrUsd, Bills::getAmountProfitUsd,
-			Bills::getAmountDrLoc, Bills::getAmountCrLoc, Bills::getAmountProfitLoc, Bills::getCheckCrStatusDescr, Bills::getCheckDrStatusDescr,
-			Bills::getStlCrStatusDescr, Bills::getStlDrStatusDescr, Bills::getInvoiceCrStatusDescr, Bills::getInvoiceDrStatusDescr, Bills::getCreateUserName,
-			Bills::getCreateTime, Bills::getUpdateUserName, Bills::getUpdateTime, Bills::getStatus, Bills::getBillStatus,
-			Bills::getAccountStatus, Bills::getRemarks, Bills::getPackingUnit, Bills::getBillDate, Bills::getTeamName,
-			Bills::getCreateUser, Bills::getTeu, Bills::getIssueType, Bills::getBookingNo, Bills::getQuantityCntrDescr,
-			Bills::getCyCnName, Bills::getCarrierCnName, Bills::getSrcType, Bills::getSrcCnName, Bills::getBookingAgentCnName,
-			Bills::getHconsigneeCnName, Bills::getCreateDeptName, Bills::getLineCnName);*/
 		lambdaQueryWrapper.eq(Bills::getIsDeleted, 0)
 			.eq(Bills::getTenantId, AuthUtil.getTenantId())
 			.eq(ObjectUtils.isNotNull(bills.getBillingStatus()), Bills::getBillingStatus, bills.getBillingStatus())

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/impl/FeeCenterServiceImpl.java

@@ -352,6 +352,9 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 						feeCenter.setQuantity(new BigDecimal("1"));
 						feeCenter.setAmount(items.getPrice().multiply(new BigDecimal("1")));
 					}
+					if (ObjectUtils.isNotNull(feeCenter.getAmount())){
+						feeCenter.setAmount(new BigDecimal("0"));
+					}
 					list.add(feeCenter);
 				}
 			}
@@ -440,6 +443,9 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 						feeCenter.setQuantity(new BigDecimal("1"));
 						feeCenter.setAmount(items.getPrice().multiply(new BigDecimal("1")));
 					}
+					if (ObjectUtils.isNotNull(feeCenter.getAmount())){
+						feeCenter.setAmount(new BigDecimal("0"));
+					}
 					list.add(feeCenter);
 				}
 			}
@@ -526,6 +532,9 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 						feeCenter.setQuantity(new BigDecimal("1"));
 						feeCenter.setAmount(items.getPrice().multiply(new BigDecimal("1")));
 					}
+					if (ObjectUtils.isNotNull(feeCenter.getAmount())){
+						feeCenter.setAmount(new BigDecimal("0"));
+					}
 					list.add(feeCenter);
 				}
 			}
@@ -1324,6 +1333,48 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 				int count = 1;
 				for (FeesTemplateItems items : losBFeesTemplate.getFeesTemplateItemsList()) {
 					FeeCenter feeCenter = new FeeCenter();
+					if ("客户".equals(items.getCorpType())) {
+						feeCenter.setCorpId(bills.getCorpId());
+						feeCenter.setCorpCnName(bills.getCorpCnName());
+						feeCenter.setCorpEnName(bills.getCorpEnName());
+						feeCenter.setShortName(bills.getShortName());
+					} else if ("船公司".equals(items.getCorpType())) {
+						feeCenter.setCorpId(bills.getCarrierId());
+						feeCenter.setCorpCnName(bills.getCarrierCnName());
+						feeCenter.setCorpEnName(bills.getCarrierEnName());
+						feeCenter.setShortName(bills.getCarrierCnName());
+					}/*else if ("工厂".equals(items.getCorpType())){
+
+					}*/ else if ("场站".equals(items.getCorpType())) {
+						feeCenter.setCorpId(bills.getCyId());
+						feeCenter.setCorpCnName(bills.getCyCnName());
+						feeCenter.setCorpEnName(bills.getCyEnName());
+						feeCenter.setShortName(bills.getCyCnName());
+					} else if ("订舱代理".equals(items.getCorpType())) {
+						feeCenter.setCorpId(bills.getBookingAgentId());
+						feeCenter.setCorpCnName(bills.getBookingAgentCnName());
+						feeCenter.setCorpEnName(bills.getBookingAgentEnName());
+						feeCenter.setShortName(bills.getBookingAgentCnName());
+					} else if ("收货代理".equals(items.getCorpType())) {
+						feeCenter.setCorpId(bills.getMconsigneeId());
+						feeCenter.setCorpCnName(bills.getMconsigneeCnName());
+						feeCenter.setCorpEnName(bills.getMconsigneeEnName());
+						feeCenter.setShortName(bills.getMconsigneeCnName());
+					} else if ("MBL通知人".equals(items.getCorpType())) {
+						feeCenter.setCorpId(bills.getMnotifyId());
+						feeCenter.setCorpCnName(bills.getMnotifyCnName());
+						feeCenter.setCorpEnName(bills.getMnotifyEnName());
+						feeCenter.setShortName(bills.getMnotifyCnName());
+					} else {
+						feeCenter.setCorpId(items.getCorpId());
+						feeCenter.setCorpCnName(items.getCorpCnName());
+						feeCenter.setCorpEnName(items.getCorpEnName());
+						feeCenter.setShortName(items.getCorpCnName());
+					}
+					/*feeCenter.setCorpId(bills.getCorpId());
+					feeCenter.setCorpCnName(bills.getCorpCnName());
+					feeCenter.setCorpEnName(bills.getCorpEnName());
+					feeCenter.setShortName(bills.getShortName());*/
 					feeCenter.setElementsCnName(items.getElementsCnName());
 					feeCenter.setElementsEnName(items.getElementsEnName());
 					feeCenter.setElementsId(items.getElementsId());
@@ -1362,10 +1413,6 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 					feeCenter.setDc(losBFeesTemplate.getDc());
 					feeCenter.setSort(count);
 					count++;
-					feeCenter.setCorpId(bills.getCorpId());
-					feeCenter.setCorpCnName(bills.getCorpCnName());
-					feeCenter.setCorpEnName(bills.getCorpEnName());
-					feeCenter.setShortName(bills.getShortName());
 					feeCenter.setFeeId(items.getFeeId());
 					feeCenter.setFeeCode(items.getFeeCode());
 					feeCenter.setFeeCnName(items.getFeeCnName());
@@ -1387,7 +1434,11 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 							}
 						}
 					}
-					feeCenter.setQuantity(new BigDecimal("1"));
+					if (ObjectUtils.isNotNull(items.getQuantity())){
+						feeCenter.setQuantity(items.getQuantity());
+					}else{
+						feeCenter.setQuantity(new BigDecimal("0"));
+					}
 					feeCenter.setAmount(items.getPrice().multiply(items.getQuantity()));
 					list.add(feeCenter);
 				}
@@ -1455,7 +1506,11 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 							}
 						}
 					}
-					feeCenter.setQuantity(new BigDecimal("1"));
+					if (ObjectUtils.isNotNull(items.getQuantity())){
+						feeCenter.setQuantity(items.getQuantity());
+					}else{
+						feeCenter.setQuantity(new BigDecimal("0"));
+					}
 					feeCenter.setAmount(items.getPrice().multiply(items.getQuantity()));
 					list.add(feeCenter);
 				}

blade-service/blade-los/src/main/java/org/springblade/los/trade/controller/AgentController.java

@@ -402,9 +402,10 @@ public class AgentController extends BladeController {
 								@RequestParam(value = "groupCode", required = false) String groupCode,
 								@RequestParam(value = "corpIds", required = false) String corpIds,
 								@RequestParam(value = "itemIds", required = false) String itemIds,
+								@RequestParam(value = "curCode", required = false) String curCode,
 								@RequestParam(value = "type", required = false) String type
 	) {
-		return agentService.getReportDataTrade(billId, reportCode, groupCode, corpIds, itemIds, type);
+		return agentService.getReportDataTrade(billId, reportCode, groupCode, corpIds, itemIds, type,curCode);
 	}
 
 	/**

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

@@ -84,7 +84,7 @@ public interface IAgentService extends IService<Agent> {
 
 	Agent detailStl(Agent agent);
 
-	R getReportDataTrade(String billId, String reportCode, String groupCode,String corpIds,  String itemIds, String type);
+	R getReportDataTrade(String billId, String reportCode, String groupCode,String corpIds,  String itemIds, String type,String curCode);
 
 	Agent revokeCollectionOfPayments(Agent agent);
 

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

@@ -259,18 +259,6 @@ public class InOutStorageServiceImpl extends ServiceImpl<InOutStorageMapper, InO
 			baseMapper.updateById(inStorage);
 			Bills bills = billsMapper.selectById(inOutStorage.getPid());
 			if (bills != null) {
-				/*Storage storage = storageService.getById(inOutStorage.getWarehouseId());
-				if (storage == null) {
-					throw new RuntimeException("未查到可用仓库，请先维护");
-				}
-				StorageFeeItems storageFeeItems = storageFeeItemsService.getOne(new LambdaQueryWrapper<StorageFeeItems>()
-					.eq(StorageFeeItems::getPid, storage.getId())
-					.eq(StorageFeeItems::getTenantId, AuthUtil.getTenantId())
-					.eq(StorageFeeItems::getIsDeleted, 0)
-					.eq(StorageFeeItems::getGoodsType, inOutStorage.getGoodsType()));
-				if (ObjectUtils.isNull(storageFeeItems)) {
-					throw new RuntimeException("未查到可用仓储费规则，请先维护");
-				}*/
 				BFees fees = bFeesService.getOne(new LambdaQueryWrapper<BFees>()
 					.eq(BFees::getTenantId, AuthUtil.getTenantId())
 					.eq(BFees::getIsDeleted, 0)
@@ -285,9 +273,7 @@ public class InOutStorageServiceImpl extends ServiceImpl<InOutStorageMapper, InO
 				StringBuilder remark = new StringBuilder("仓储费：");
 				BigDecimal outWeight = inOutStorage.getOutWeight().divide(new BigDecimal("1000"), 4, RoundingMode.HALF_UP);
 				BigDecimal dayDecimal = new BigDecimal(day);
-//				BigDecimal amountSum = dayDecimal.multiply(storageFeeItems.getPrice()).multiply(outWeight);
 				BigDecimal amountSum = dayDecimal.multiply(inOutStorage.getStorageFeePriceD()).multiply(outWeight);
-//				remark.append(day).append("天*").append(storageFeeItems.getPrice()).append("元*").append(outWeight).append("吨=").append(amountSum).append("元 ");
 				remark.append(day).append("天*").append(inOutStorage.getStorageFeePriceD()).append("元*").append(outWeight).append("吨=").append(amountSum).append("元 ");
 				FeeCenter feeCenter = new FeeCenter();
 				feeCenter.setCreateTime(new Date());
@@ -329,7 +315,6 @@ public class InOutStorageServiceImpl extends ServiceImpl<InOutStorageMapper, InO
 				feeCenter.setElementsEnName(fees.getElementsEnName());
 				feeCenter.setUnitNo("JOB");
 				feeCenter.setQuantity(outWeight);
-//				feeCenter.setPrice(storageFeeItems.getPrice());
 				feeCenter.setPrice(inOutStorage.getStorageFeePriceD());
 				feeCenter.setAmount(amountSum);
 				feeCenter.setRemarks(remark.toString());
@@ -339,9 +324,7 @@ public class InOutStorageServiceImpl extends ServiceImpl<InOutStorageMapper, InO
 				feeCenter.setSrcItemId(inOutStorage.getId());
 				feeCenterMapper.insert(feeCenter);
 				StringBuilder remarkC = new StringBuilder("仓储费：");
-//				BigDecimal amountSumC = dayDecimal.multiply(storageFeeItems.getPriceC()).multiply(outWeight);
 				BigDecimal amountSumC = dayDecimal.multiply(inOutStorage.getStorageFeePriceC()).multiply(outWeight);
-//				remarkC.append(day).append("天*").append(storageFeeItems.getPriceC()).append("元*").append(outWeight).append("吨=").append(amountSumC).append("元 ");
 				remarkC.append(day).append("天*").append(inOutStorage.getStorageFeePriceC()).append("元*").append(outWeight).append("吨=").append(amountSumC).append("元 ");
 				FeeCenter feeCenterC = new FeeCenter();
 				feeCenterC.setCreateTime(new Date());
@@ -357,8 +340,6 @@ public class InOutStorageServiceImpl extends ServiceImpl<InOutStorageMapper, InO
 				feeCenterC.setLineNo(1L);
 				feeCenterC.setBillNo(bills.getBillNo());
 				feeCenterC.setBillDate(bills.getBillDate());
-				/*feeCenterC.setCorpId(bills.getCorpId());
-				feeCenterC.setCorpCnName(bills.getCorpCnName());*/
 				feeCenterC.setBillCorpId(bills.getCorpId());
 				feeCenterC.setBillCorpCnName(bills.getCorpCnName());
 				feeCenterC.setMblno(bills.getMblno());
@@ -383,7 +364,6 @@ public class InOutStorageServiceImpl extends ServiceImpl<InOutStorageMapper, InO
 				feeCenterC.setElementsEnName(fees.getElementsEnName());
 				feeCenterC.setUnitNo("JOB");
 				feeCenterC.setQuantity(outWeight);
-//				feeCenterC.setPrice(storageFeeItems.getPriceC());
 				feeCenterC.setPrice(inOutStorage.getStorageFeePriceC());
 				feeCenterC.setAmount(amountSumC);
 				feeCenterC.setRemarks(remarkC.toString());
@@ -393,7 +373,7 @@ public class InOutStorageServiceImpl extends ServiceImpl<InOutStorageMapper, InO
 				feeCenterC.setSrcItemId(inOutStorage.getId());
 				feeCenterMapper.insert(feeCenterC);
 				inOutStorage.setStorageDays(Integer.parseInt(day + ""));
-				inOutStorage.setStorageFeesAmount(amountSum);
+				inOutStorage.setStorageFeesAmount(amountSumC);
 			}
 		}
 		baseMapper.updateById(inOutStorage);

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/controller/PriceBankController.java

@@ -302,7 +302,7 @@ public class PriceBankController extends BladeController {
 	 * 福达查询产品
 	 */
 	@GetMapping("/pageListAllV1")
-	public R<List<PriceBank>> pageListAllV1(PriceBankVO priceBank) {
+	public R<IPage<PriceBank>> pageListAllV1(PriceBankVO priceBank, Query query) {
 		LambdaQueryWrapper<PriceBank> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		if (priceBank.getGoodTypeId() != null) {
 			List<Long> goodTypeMessage = corpsDescClient.getGoodTypeMessage(priceBank.getGoodTypeId());
@@ -331,12 +331,12 @@ public class PriceBankController extends BladeController {
 		lambdaQueryWrapper.le(Func.isNotEmpty(priceBank.getDateValidityEnd()), PriceBank::getEndTime, priceBank.getDateValidityEnd());
 		lambdaQueryWrapper.eq(Func.isNotEmpty(priceBank.getBillType()), PriceBank::getBillType, priceBank.getBillType());
 		lambdaQueryWrapper.orderByDesc(PriceBank::getId);
-		List<PriceBank> pages = priceBankService.list(lambdaQueryWrapper);
-		if (CollectionUtils.isNotEmpty(pages)) {
+		IPage<PriceBank> pages = priceBankService.page(Condition.getPage(query), lambdaQueryWrapper);
+		if (CollectionUtils.isNotEmpty(pages.getRecords())) {
 			String corpIds = "";
 			String goodsIds = "";
 			List<Long> goodsSpecification = new ArrayList<>();
-			for (PriceBank item : pages) {
+			for (PriceBank item : pages.getRecords()) {
 				corpIds = corpIds + item.getCorpId() + ",";
 				goodsIds = goodsIds + item.getItemId() + ",";
 				goodsSpecification.add(item.getItemId());
@@ -353,7 +353,7 @@ public class PriceBankController extends BladeController {
 			if (!goodsSpecification.isEmpty()){
 				goodsSpecificationList = goodsDescClient.goodsSpecificationLists(goodsSpecification);
 			}
-			for (PriceBank item : pages) {
+			for (PriceBank item : pages.getRecords()) {
 				if (ObjectUtils.isNotNull(item.getItemId()) && !goodsList.isEmpty()) {
 					//商品
 					GoodsDesc goodsDesc = goodsList.stream().filter(goods -> goods.getId().equals(item.getItemId())).findFirst().orElse(null);
@@ -364,7 +364,9 @@ public class PriceBankController extends BladeController {
 				if (ObjectUtils.isNotNull(item.getItemId()) && !goodsSpecificationList.isEmpty()) {
 					List<GoodsSpecification> goodsSpecifications = goodsSpecificationList.stream().filter(e -> e.getPid().equals(item.getItemId())).collect(Collectors.toList());
 					List<GoodsSpecificationDto> goodsSpecificationDtoList = BeanUtil.copy(goodsSpecifications, GoodsSpecificationDto.class);
-					item.setGoodsSpecificationList(goodsSpecificationDtoList);
+					item.setGoodsSpecificationList(goodsSpecificationDtoList.isEmpty()?new ArrayList<>():goodsSpecificationDtoList);
+				}else{
+					item.setGoodsSpecificationList(new ArrayList<>());
 				}
 				if (item.getCorpId() != null && !corpsDescList.isEmpty()) {
 					//客户

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

@@ -6181,28 +6181,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 					corpsDesc.setPointsBalance(corpsDesc.getPointsBalance().subtract(goodsDesc.getIntegral().multiply(e.getGoodsNum())));
 				}
 			}
-			if (new BigDecimal("0.00").compareTo(integral) != 0){
-				PjIntegralDetail integralDetail = new PjIntegralDetail();
-				integralDetail.setCreateTime(new Date());
-				integralDetail.setCreateUserName(AuthUtil.getUserName());
-				integralDetail.setCreateUser(AuthUtil.getUserId());
-				integralDetail.setType("积分退回");
-				integralDetail.setSrcId(order.getId());
-				integralDetail.setSrcNo(order.getOrdNo());
-				integralDetail.setCorpId(order.getCustomerId());
-				integralDetail.setCorpName(order.getCustomerName());
-				integralDetail.setIntegral(integral);
-				integralDetail.setGoodsName(order.getGoodsNameJoin());
-				StringBuilder goodsId = new StringBuilder();
-				for (Long item : goodsIds) {
-					goodsId.append(item).append(",");
-				}
-				if (goodsId.length() > 0) {
-					integralDetail.setGoodsId(goodsId.substring(0, goodsId.length() - 1));
-				}
-				integralDetailService.saveOrUpdate(integralDetail);
-				corpsDescMapper.updateById(corpsDesc);
-			}
 			if (!"TKXS".equals(order.getBsType())) {
 				if (OrderTypeEnum.SHIPED.getType().equals(order.getOriginalStatus())
 					|| OrderTypeEnum.RECEIVEDGOODS.getType().equals(order.getOriginalStatus())) {//已发货
@@ -6326,13 +6304,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 								item.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
 								item.setCreateTime(new Date());
 								item.setCreateUser(AuthUtil.getUserId());
-								item.setPid(order.getId());
 								item.setTenantId(AuthUtil.getTenantId());
 								orderItemsService.save(item);
 							} else {
 								item.setUpdateTime(new Date());
 								item.setUpdateUser(AuthUtil.getUserId());
-								item.setPid(order.getId());
 								orderItemsService.updateById(item);
 							}
 							if (!"GX".equals(item.getBizType())) {
@@ -6419,6 +6395,28 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 							item.setPaymentAmountTl(new BigDecimal("0.00"));
 							order.setActualPaymentStatus(4);
 						}
+						if (new BigDecimal("0.00").compareTo(integral) != 0){
+							PjIntegralDetail integralDetail = new PjIntegralDetail();
+							integralDetail.setCreateTime(new Date());
+							integralDetail.setCreateUserName(AuthUtil.getUserName());
+							integralDetail.setCreateUser(AuthUtil.getUserId());
+							integralDetail.setType("积分退回");
+							integralDetail.setSrcId(order.getId());
+							integralDetail.setSrcNo(order.getOrdNo());
+							integralDetail.setCorpId(order.getCustomerId());
+							integralDetail.setCorpName(order.getCustomerName());
+							integralDetail.setIntegral(integral);
+							integralDetail.setGoodsName(order.getGoodsNameJoin());
+							StringBuilder goodsId = new StringBuilder();
+							for (Long item : goodsIds) {
+								goodsId.append(item).append(",");
+							}
+							if (goodsId.length() > 0) {
+								integralDetail.setGoodsId(goodsId.substring(0, goodsId.length() - 1));
+							}
+							integralDetailService.saveOrUpdate(integralDetail);
+							corpsDescMapper.updateById(corpsDesc);
+						}
 					} else {
 						throw new RuntimeException("退款失败！服务器错误");
 					}

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

@@ -2339,6 +2339,10 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 			if (!res.isSuccess()) {
 				throw new RuntimeException(res.getMsg());
 			}
+			String stata = sysClient.getParamService("whether.open.share");
+			if (!pjProductLaunchList.isEmpty() && "1".equals(stata)){
+				sharePutOnShelvesService.updateShareInventory(pjProductLaunchList);
+			}
 			ship.setShipItemsList(ship.getShipItemsList());
 			ship.setNumberRows(ship.getShipItemsList().size());
 		}
@@ -2894,10 +2898,6 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 						stockOne.setRebatePrice(stockOne.getRebateInventoryAmount().divide(stockOne.getBalanceQuantity(), MathContext.DECIMAL32).setScale(2, RoundingMode.HALF_UP));
 					}
 					stockOne.setVersion(stockOne.getVersion());
-					/*R res = iStockDescService.updateByIdNew(stockOne);
-					if (!res.isSuccess()) {
-						throw new RuntimeException(res.getMsg());
-					}*/
 					if (new BigDecimal("0.00").compareTo(stockOne.getBalanceQuantity()) == 0
 						&& new BigDecimal("0.00").compareTo(stockOne.getBalanceQuantityFinancing()) == 0
 						&& new BigDecimal("0.00").compareTo(stockOne.getBalanceQuantityHave()) == 0
@@ -2932,8 +2932,6 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 			List<PjProductLaunch> productLaunch = productLaunchService.list(productLaunchQueryWrapper);
 
 			for (PjShipItems item : ship.getShipItemsList()) {
-				/* ----------------------修改上架库存---------------------- */
-//				List<PjStockDesc> stockDescList = pjStockDescList.stream().filter(e -> e.getGoodsId().equals(item.getGoodsId())).collect(Collectors.toList());
 				PjOrderItems orderItems = pjOrderItems.stream().filter(e -> e.getId().equals(item.getSrcItemId())).findFirst().orElse(null);
 				if (orderItems != null) {
 					orderItems.setSendNum(orderItems.getSendNum().subtract(item.getSendNum()));
@@ -2961,13 +2959,16 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 					pjProductLaunches.setInventory(pjProductLaunches.getInventory().subtract(item.getSendNum()));
 					pjProductLaunchList.add(pjProductLaunches);
 				}
-				/* ----------------------修改上架库存---------------------- */
 			}
 			orderItemsService.updateBatchById(pjOrderItemsList);
 			R res = productLaunchService.updateBatchById(pjProductLaunchList);
 			if (!res.isSuccess()) {
 				throw new RuntimeException(res.getMsg());
 			}
+			String stata = sysClient.getParamService("whether.open.share");
+			if (!pjProductLaunchList.isEmpty() && "1".equals(stata)){
+				sharePutOnShelvesService.updateShareInventory(pjProductLaunchList);
+			}
 			ship.setShipItemsList(ship.getShipItemsList());
 			ship.setNumberRows(ship.getShipItemsList().size());
 		}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/statistics/service/impl/StatisticsServiceImpl.java

@@ -588,10 +588,7 @@ public class StatisticsServiceImpl implements IStatisticsService {
 				List<SaleDetailDto> saleDetailDtoList1 = saleDetailDtoIPage.getRecords().stream()
 					.filter(e -> e.getOrdNo().equals(item.getOrdNo())).collect(Collectors.toList());
 				if (!saleDetailDtoList1.isEmpty()) {
-					BigDecimal returnsAmount = pjOrderItemsList.stream().filter(e -> e.getPid().equals(item.getId())
-							&& !"线下退款".equals(e.getRefundType())).map(PjOrderItems::getReturnsAmount)
-						.reduce(BigDecimal.ZERO, BigDecimal::add);
-					BigDecimal amount = item.getPaymentAmountTl().subtract(returnsAmount);
+					BigDecimal amount = item.getPaymentAmountTl();
 					amount = amount.abs();
 					for (SaleDetailDto items : saleDetailDtoList1) {
 						items.setRemarks(item.getRemarks());
@@ -620,20 +617,8 @@ public class StatisticsServiceImpl implements IStatisticsService {
 						}
 						if ("已取消".equals(items.getStatus())) {
 							items.setBalanceAmount(new BigDecimal("0.00"));
-//							items.setGoodsNum(new BigDecimal("0.00"));
-//							items.setProfit(new BigDecimal("0.00"));
-//							items.setSubTotalMoney(new BigDecimal("0.00"));
-//							items.setFreight(new BigDecimal("0.00"));
-//							items.setCostprie(new BigDecimal("0.00"));
 						} else {
 							if ("TKXS".equals(item.getBsType()) || "TKCG".equals(item.getBsType())) {
-								if (amount.compareTo(items.getSubTotalMoney().abs()) >= 0) {
-									items.setBalanceAmount(new BigDecimal("0.00"));
-									amount = amount.subtract(items.getSubTotalMoney().abs());
-								} else {
-									items.setBalanceAmount(new BigDecimal("0.00").subtract(items.getSubTotalMoney().abs().subtract(amount)));
-									amount = new BigDecimal("0.00");
-								}
 								items.setGoodsNum(new BigDecimal("0.00").subtract(items.getReturnsNumber()));
 								items.setSubTotalMoney(new BigDecimal("0.00").subtract(items.getReturnsAmount()).subtract(item.getFreight()));
 								items.setFreight(new BigDecimal("0.00").subtract(items.getFreight()));
@@ -641,6 +626,13 @@ public class StatisticsServiceImpl implements IStatisticsService {
 								BigDecimal profit = items.getSubTotalMoney().abs().subtract(costprie);
 								items.setProfit(new BigDecimal("0.00").subtract(profit));
 								items.setCostprie(new BigDecimal("0.00").subtract(costprie));
+								if (amount.compareTo(items.getSubTotalMoney().abs()) >= 0) {
+									items.setBalanceAmount(new BigDecimal("0.00"));
+									amount = amount.subtract(items.getSubTotalMoney().abs());
+								} else {
+									items.setBalanceAmount(new BigDecimal("0.00").subtract(items.getSubTotalMoney().abs().subtract(amount)));
+									amount = new BigDecimal("0.00");
+								}
 							} else {
 								if (amount.compareTo(items.getSubTotalMoney()) >= 0) {
 									items.setBalanceAmount(new BigDecimal("0.00"));
@@ -981,14 +973,11 @@ public class StatisticsServiceImpl implements IStatisticsService {
 					.eq(PjOrderItems::getTenantId, AuthUtil.getTenantId())
 					.in(PjOrderItems::getPid, pids));
 			}
-			/*for (PjOrder item : pjOrderList) {
+			for (PjOrder item : pjOrderList) {
 				List<SaleDetailDto> saleDetailDtoList1 = saleDetailDtoIPage.stream()
 					.filter(e -> e.getOrdNo().equals(item.getOrdNo())).collect(Collectors.toList());
 				if (!saleDetailDtoList1.isEmpty()) {
-					BigDecimal returnsAmount = pjOrderItemsList.stream().filter(e -> e.getPid().equals(item.getId())
-							&& !"线下退款".equals(e.getRefundType())).map(PjOrderItems::getReturnsAmount)
-						.reduce(BigDecimal.ZERO, BigDecimal::add);
-					BigDecimal amount = item.getPaymentAmountTl().subtract(returnsAmount);
+					BigDecimal amount = item.getPaymentAmountTl();
 					amount = amount.abs();
 					for (SaleDetailDto items : saleDetailDtoList1) {
 						items.setRemarks(item.getRemarks());
@@ -1017,86 +1006,15 @@ public class StatisticsServiceImpl implements IStatisticsService {
 						}
 						if ("已取消".equals(items.getStatus())) {
 							items.setBalanceAmount(new BigDecimal("0.00"));
-							items.setGoodsNum(new BigDecimal("0.00"));
-							items.setProfit(new BigDecimal("0.00"));
-							items.setSubTotalMoney(new BigDecimal("0.00"));
-							items.setFreight(new BigDecimal("0.00"));
-							items.setCostprie(new BigDecimal("0.00"));
 						} else {
 							if ("TKXS".equals(item.getBsType()) || "TKCG".equals(item.getBsType())) {
-								if (amount.compareTo(items.getSubTotalMoney().abs()) >= 0) {
-									items.setBalanceAmount(new BigDecimal("0.00"));
-									amount = amount.subtract(items.getSubTotalMoney().abs());
-								} else {
-									items.setBalanceAmount(new BigDecimal("0.00").subtract(items.getSubTotalMoney().abs().subtract(amount)));
-									amount = new BigDecimal("0.00");
-								}
 								items.setGoodsNum(new BigDecimal("0.00").subtract(items.getReturnsNumber()));
 								items.setSubTotalMoney(new BigDecimal("0.00").subtract(items.getReturnsAmount()).subtract(item.getFreight()));
+								items.setFreight(new BigDecimal("0.00").subtract(items.getFreight()));
 								BigDecimal costprie = items.getReturnsNumber().multiply(items.getCostpriePrice());
 								BigDecimal profit = items.getSubTotalMoney().abs().subtract(costprie);
 								items.setProfit(new BigDecimal("0.00").subtract(profit));
-								items.setFreight(new BigDecimal("0.00").subtract(items.getFreight()));
 								items.setCostprie(new BigDecimal("0.00").subtract(costprie));
-							} else {
-								if (amount.compareTo(items.getSubTotalMoney()) >= 0) {
-									items.setBalanceAmount(new BigDecimal("0.00"));
-									amount = amount.subtract(items.getSubTotalMoney());
-								} else {
-									items.setBalanceAmount(items.getSubTotalMoney().subtract(amount));
-									amount = new BigDecimal("0.00");
-								}
-							}
-						}
-						items.setSurplusNum(items.getGoodsNum().subtract(items.getOutGoodsTotalShipNum()));
-						items.setSurplusAmount(items.getSubTotalMoney().subtract(items.getOutGoodsTotalShipAmount()));
-						saleDetailDtoList2.add(items);
-					}
-				}
-			}*/
-			for (PjOrder item : pjOrderList) {
-				List<SaleDetailDto> saleDetailDtoList1 = saleDetailDtoIPage.stream()
-					.filter(e -> e.getOrdNo().equals(item.getOrdNo())).collect(Collectors.toList());
-				if (!saleDetailDtoList1.isEmpty()) {
-					BigDecimal returnsAmount = pjOrderItemsList.stream().filter(e -> e.getPid().equals(item.getId())
-							&& !"线下退款".equals(e.getRefundType())).map(PjOrderItems::getReturnsAmount)
-						.reduce(BigDecimal.ZERO, BigDecimal::add);
-					BigDecimal amount = item.getPaymentAmountTl().subtract(returnsAmount);
-					amount = amount.abs();
-					for (SaleDetailDto items : saleDetailDtoList1) {
-						items.setRemarks(item.getRemarks());
-						if (!pjOrderItemsList.isEmpty()) {
-							PjOrderItems orderItems = pjOrderItemsList.stream().filter(e -> e.getId().equals(items.getItemId())).findFirst().orElse(null);
-							if (orderItems != null) {
-								items.setItemRemarks(orderItems.getRemarks());
-								items.setGoodsNum(orderItems.getGoodsNum());
-								items.setPrice(orderItems.getPrice());
-								items.setSubTotalMoney(orderItems.getGoodsNum().multiply(orderItems.getPrice()));
-								items.setSubTotalMoney(items.getSubTotalMoney().add(item.getFreight()));
-								if ("1".equals(saleDetailDto.getWhetherRebate())) {
-									items.setCostprie(orderItems.getGoodsNum().multiply(orderItems.getRebatePrice()));
-								} else {
-									items.setCostprie(orderItems.getGoodsNum().multiply(orderItems.getCostpriePrice()));
-								}
-								items.setProfit(items.getSubTotalMoney().subtract(items.getCostprie()));
-								items.setReturnsNumber(orderItems.getReturnsNumber());
-								items.setReturnsAmount(orderItems.getReturnsAmount());
-								items.setOutGoodsTotalShipNum(orderItems.getOutGoodsTotalShipNum());
-								items.setOutGoodsTotalShipAmount(orderItems.getOutGoodsTotalShipAmount());
-								items.setPrimaryGoodsTotalNum(orderItems.getPrimaryGoodsTotalNum());
-								items.setPrimaryGoodsTotalMoney(orderItems.getPrimaryGoodsTotalAmount());
-								items.setCostpriePrice(orderItems.getCostpriePrice());
-							}
-						}
-						if ("已取消".equals(items.getStatus())) {
-							items.setBalanceAmount(new BigDecimal("0.00"));
-//							items.setGoodsNum(new BigDecimal("0.00"));
-//							items.setProfit(new BigDecimal("0.00"));
-//							items.setSubTotalMoney(new BigDecimal("0.00"));
-//							items.setFreight(new BigDecimal("0.00"));
-//							items.setCostprie(new BigDecimal("0.00"));
-						} else {
-							if ("TKXS".equals(item.getBsType()) || "TKCG".equals(item.getBsType())) {
 								if (amount.compareTo(items.getSubTotalMoney().abs()) >= 0) {
 									items.setBalanceAmount(new BigDecimal("0.00"));
 									amount = amount.subtract(items.getSubTotalMoney().abs());
@@ -1104,13 +1022,6 @@ public class StatisticsServiceImpl implements IStatisticsService {
 									items.setBalanceAmount(new BigDecimal("0.00").subtract(items.getSubTotalMoney().abs().subtract(amount)));
 									amount = new BigDecimal("0.00");
 								}
-								items.setGoodsNum(new BigDecimal("0.00").subtract(items.getReturnsNumber()));
-								items.setSubTotalMoney(new BigDecimal("0.00").subtract(items.getReturnsAmount()).subtract(item.getFreight()));
-								items.setFreight(new BigDecimal("0.00").subtract(items.getFreight()));
-								BigDecimal costprie = items.getReturnsNumber().multiply(items.getCostpriePrice());
-								BigDecimal profit = items.getSubTotalMoney().abs().subtract(costprie);
-								items.setProfit(new BigDecimal("0.00").subtract(profit));
-								items.setCostprie(new BigDecimal("0.00").subtract(costprie));
 							} else {
 								if (amount.compareTo(items.getSubTotalMoney()) >= 0) {
 									items.setBalanceAmount(new BigDecimal("0.00"));