Ver Fonte

2023年1月6日16:04:48

纪新园 há 3 anos atrás
pai
commit
c0c65fd388

+ 6 - 0
blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/feign/IFinanceClient.java

@@ -133,6 +133,12 @@ public interface IFinanceClient {
 	Acc selectBySrcId(@RequestParam("srcId") Long srcId);
 
 	/**
+	 * 查询账单列表(通过单据客户id)
+	 */
+	@GetMapping("/acc/selectByCorpId")
+	R<List<Acc>> selectByCorpId(@RequestParam("corpId") Long corpId);
+
+	/**
 	 * 查询账单详情(通过单据id)
 	 */
 	@PostMapping("/acc/remove")

+ 15 - 7
blade-service/blade-client/src/main/java/org/springblade/client/goods/excel/GoodsInfoPartsExcel.java

@@ -31,35 +31,43 @@ public class GoodsInfoPartsExcel implements Serializable {
 	/**
 	 * 标准售价
 	 */
-	@ExcelProperty("标准售价(必填)")
+	@ExcelProperty("售价1(必填)")
 	private BigDecimal standardPrice;
 
 	/**
 	 * 批发售价
 	 */
-	@ExcelProperty("批发售价")
+	@ExcelProperty("售价2")
 	private BigDecimal wholesalePrice;
 
 	/**
 	 * 汽修厂售价
 	 */
-	@ExcelProperty("汽修厂售价")
+	@ExcelProperty("售价3")
 	private BigDecimal repairDepotPrice;
 
 	/**
 	 * 门店售价
 	 */
-	@ExcelProperty("门店售价")
+	@ExcelProperty("售价4")
 	private BigDecimal storePrice;
+
+	//其他售价
+	@ExcelProperty("售价5(必填)")
+	private BigDecimal price;
+
+	/**
+	 * 特价
+	 */
+	@ExcelProperty("特价(必填)")
+	private BigDecimal specialOffer;
+
 	/**
 	 * 采购价
 	 */
 	@ExcelProperty("采购价(必填)")
 	private BigDecimal purchasePrice;
 
-	//其他售价
-	@ExcelProperty("其他售价(必填)")
-	private BigDecimal price;
 
 	//是否批次号管理
 	@ExcelProperty("是否批次号管理")

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

@@ -1295,7 +1295,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
 		List<Items> itemsList = new ArrayList<>();
 		Items LandOrderItems = new Items();
 		LandOrderItems.setSrcOrderno(order.getBillNo());
-		LandOrderItems.setCorpId(order.getCorpId());
 		LandOrderItems.setSrcParentId(pid);
 		LandOrderItems.setCurrency("CNY");
 		LandOrderItems.setSrcType(9);
@@ -1315,8 +1314,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
 			LandOrderItems.setChargeMember(corpsDesc.getCname());
 		}
 		LandOrderItems.setDepartureHarbor(order.getStation());
-		LandOrderItems.setShipName(order.getDispatcher() + "");
-
+		if (ObjectUtils.isNotNull(order.getDispatcher())){
+			LandOrderItems.setShipName(order.getDispatcher() + "");
+		}
 		LambdaQueryWrapper<OrderAddress> orderAddressLambdaQueryWrapper = new LambdaQueryWrapper<>();
 		orderAddressLambdaQueryWrapper.eq(OrderAddress::getIsDeleted, 0);
 		orderAddressLambdaQueryWrapper.eq(OrderAddress::getOrderId, pid);
@@ -1325,15 +1325,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
 		List<String> arr = orderAddressList.stream().map(OrderAddress::getAddress).distinct().collect(Collectors.toList());
 		LandOrderItems.setObjectiveHarbor(String.join(",", arr));
 
-
 		if ("集装箱".equals(order.getShippingMode())) {
-			LandOrderItems.setSrcBoxBillType("ZDLU-JZX");
-			LandOrderItems.setItemType("ZDLU-JZX");
-			LandOrderItems.setPrice(order.getFreight());
-			//账单数据
-			LandOrderItems.setAmount(order.getFreight());
-			LandOrderItems.setQuantity(new BigDecimal("1"));
-			LandOrderItems.setSrcFeesType("收费");
 			LambdaQueryWrapper<OrderItem> orderItemLambdaQueryWrapper = new LambdaQueryWrapper<>();
 			orderItemLambdaQueryWrapper.eq(OrderItem::getIsDeleted, 0);
 			orderItemLambdaQueryWrapper.eq(OrderItem::getOrderId, pid);
@@ -1341,13 +1333,33 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
 			orderItemLambdaQueryWrapper.eq(OrderItem::getKind, 2);
 			List<OrderItem> orderItemList = orderItemMapper.selectList(orderItemLambdaQueryWrapper);
 			if (ObjectUtils.isNotNull(orderItemList) && orderItemList.size() > 0) {
-				LandOrderItems.setFleetId(orderItemList.get(0).getFleetId());
+				for (OrderItem orderItem : orderItemList) {
+					for (int i = 0; i < 2; i++) {
+						Items LandItems = new Items();
+						BeanUtil.copyProperties(LandOrderItems, LandItems);
+						LandItems.setSrcBoxBillType("ZDLU-JZX");
+						LandItems.setItemType("ZDLU-JZX");
+						LandItems.setQuantity(new BigDecimal("1"));
+						LandItems.setFleetId(orderItem.getFleetId());
+						LandItems.setPlateNo(orderItem.getPlateNo());
+						LandItems.setCtnType(order.getShippingMode());
+						if (i == 0 && ObjectUtils.isNotNull(orderItem.getLandAmountD())) {
+							LandItems.setCorpId(order.getCorpId());
+							LandItems.setSrcFeesType("收费");
+							LandItems.setPrice(orderItem.getLandAmountD());
+							LandItems.setAmount(orderItem.getLandAmountD());
+							itemsList.add(LandItems);
+						}
+						if (i == 1 && ObjectUtils.isNotNull(orderItem.getLandAmountC())) {
+							LandItems.setCorpId(orderItem.getFleetId());
+							LandItems.setSrcFeesType("付费");
+							LandItems.setPrice(orderItem.getLandAmountC());
+							LandItems.setAmount(orderItem.getLandAmountC());
+							itemsList.add(LandItems);
+						}
+					}
+				}
 			}
-			List<String> PlateNo = orderItemList.stream().map(OrderItem::getPlateNo).distinct().collect(Collectors.toList());
-			LandOrderItems.setPlateNo(String.join(",", PlateNo));
-			List<String> CtnType = orderItemList.stream().map(OrderItem::getCtnType).distinct().collect(Collectors.toList());
-			LandOrderItems.setCtnType(String.join(",", CtnType));
-			itemsList.add(LandOrderItems);
 		} else {
 			for (int i = 0; i < 2; i++) {
 				Items LandItems = new Items();
@@ -1357,15 +1369,17 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
 				LandItems.setQuantity(new BigDecimal("1"));
 				LandItems.setFleetId(order.getFleetId());
 				LandItems.setPlateNo(order.getPlateNo());
-				LandItems.setCtnType("散货");
+				LandItems.setCtnType(order.getShippingMode());
 
 				if (i == 0 && ObjectUtils.isNotNull(order.getFreightCollect())) {
+					LandItems.setCorpId(order.getCorpId());
 					LandItems.setSrcFeesType("收费");
 					LandItems.setPrice(order.getFreightCollect());
 					LandItems.setAmount(order.getFreightCollect());
 					itemsList.add(LandItems);
 				}
 				if (i == 1 && ObjectUtils.isNotNull(order.getFreightPay())) {
+					LandItems.setCorpId(order.getFleetId());
 					LandItems.setSrcFeesType("付费");
 					LandItems.setPrice(order.getFreightPay());
 					LandItems.setAmount(order.getFreightPay());
@@ -1435,48 +1449,48 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
 				}
 				items.setSrcFeesId(transportItemFees.getId());
 				itemsList.add(items);
-				applyDTO.setItemsList(itemsList);
 				//修改费用明细
 				transportItemFees.setSubmitPay(1);
 				orderFeeMapper.updateById(transportItemFees);
 			}
-			if (CollectionUtils.isNotEmpty(itemsList)) {
-				//生成账单
-				R paymentApply = financeClient.paymentApplyLandOrder(applyDTO);
-				if (!paymentApply.isSuccess()) {
-					throw new RuntimeException(paymentApply.getMsg());
-				}
-				//给角色为财务的人发送消息
-				R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
-				if (clientDeptIds.isSuccess() && com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(clientDeptIds.getData())) {
-					R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()));
-					if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
-						for (User datum : userList.getData()) {
-							//循环发送消息
-							Message sendMessage = new Message();
-							sendMessage.setParameter(String.valueOf(pid));
-							sendMessage.setUserName(AuthUtil.getUserName());
-							sendMessage.setUserId(AuthUtil.getUserId());
-							sendMessage.setToUserId(datum.getId());
-							sendMessage.setToUserName(datum.getName());
-							sendMessage.setMessageType(1);
-							sendMessage.setTenantId(AuthUtil.getTenantId());
-							sendMessage.setCreateUser(AuthUtil.getUserId());
-							sendMessage.setCreateTime(new Date());
+		}
+		if (CollectionUtils.isNotEmpty(itemsList)) {
+			applyDTO.setItemsList(itemsList);
+			//生成账单
+			R paymentApply = financeClient.paymentApplyLandOrder(applyDTO);
+			if (!paymentApply.isSuccess()) {
+				throw new RuntimeException(paymentApply.getMsg());
+			}
+			//给角色为财务的人发送消息
+			R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "财务");
+			if (clientDeptIds.isSuccess() && com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(clientDeptIds.getData())) {
+				R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()));
+				if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
+					for (User datum : userList.getData()) {
+						//循环发送消息
+						Message sendMessage = new Message();
+						sendMessage.setParameter(String.valueOf(pid));
+						sendMessage.setUserName(AuthUtil.getUserName());
+						sendMessage.setUserId(AuthUtil.getUserId());
+						sendMessage.setToUserId(datum.getId());
+						sendMessage.setToUserName(datum.getName());
+						sendMessage.setMessageType(1);
+						sendMessage.setTenantId(AuthUtil.getTenantId());
+						sendMessage.setCreateUser(AuthUtil.getUserId());
+						sendMessage.setCreateTime(new Date());
 							/*sendMessage.setUrl(order.getUrl());
 							sendMessage.setPageLabel(order.getPageLabel());
 							sendMessage.setPageStatus(order.getPageStatus());*/
-							sendMessage.setMessageBody("您订单" + order.getOrderNo() + "审核通过,请查看");
-							R save = messageClient.save(sendMessage);
-							if (!save.isSuccess()) {
-								throw new SecurityException("发送消息失败");
-							}
+						sendMessage.setMessageBody("您订单" + order.getOrderNo() + "审核通过,请查看");
+						R save = messageClient.save(sendMessage);
+						if (!save.isSuccess()) {
+							throw new SecurityException("发送消息失败");
 						}
 					}
 				}
 			}
 		}
-		return null;
+		return landOrder;
 	}
 
 	private List<OrderItem> getOrderItemList(Long id) {

+ 8 - 7
blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/feign/OrderDescClient.java

@@ -92,17 +92,18 @@ public class OrderDescClient implements IOrderDescClient {
 					);
 				}
 			}
-		}
-		if (ObjectUtil.isNotEmpty(order.getStatus())) {
-			if (ParamCache.getValue(APPROVAL_PROCESS).equals("1") || 6 == order.getStatus()) {
-				iOrderService.collectHairGoods(order);
+			iOrderService.updateById(order);
+		} else {
+			if (ObjectUtil.isNotEmpty(order.getStatus())) {
+				if (ParamCache.getValue(APPROVAL_PROCESS).equals("1") || 6 == order.getStatus()) {
+					iOrderService.collectHairGoods(order);
+				} else {
+					iOrderService.updateById(order);
+				}
 			} else {
 				iOrderService.updateById(order);
 			}
-		} else {
-			iOrderService.updateById(order);
 		}
-
 		return R.success("操作成功");
 	}
 

+ 36 - 13
blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -2501,7 +2501,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					// 保存订单明细
 					if (CollectionUtils.isNotEmpty(order.getOrderItemsList())) {
 						for (OrderItems orderItems : order.getOrderItemsList()) {
-							orderItems.setAmount(orderItems.getStorageInQuantity().multiply(orderItems.getPrice(), MathContext.DECIMAL32));
+							if ("XS".equals(order.getBillType())) {
+								orderItems.setAmount(orderItems.getStorageInQuantity().multiply(orderItems.getPrice(), MathContext.DECIMAL32));
+							}else{
+								orderItems.setAmount(orderItems.getStorageInQuantity().multiply(orderItems.getPurchasePrice(), MathContext.DECIMAL32));
+							}
 							BigDecimal stockPrice = new BigDecimal("0.00");
 							BigDecimal surplusRouteQuantity = new BigDecimal("0.00");
 							BigDecimal balanceQuantity = new BigDecimal("0.00");
@@ -2701,7 +2705,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				// 保存订单明细
 				if (CollectionUtils.isNotEmpty(order.getOrderItemsList())) {
 					for (OrderItems orderItems : order.getOrderItemsList()) {
-						orderItems.setAmount(orderItems.getStorageInQuantity().multiply(orderItems.getPrice(), MathContext.DECIMAL32));
+						if ("XS".equals(order.getBillType())) {
+							orderItems.setAmount(orderItems.getStorageInQuantity().multiply(orderItems.getPrice(), MathContext.DECIMAL32));
+						}else{
+							orderItems.setAmount(orderItems.getStorageInQuantity().multiply(orderItems.getPurchasePrice(), MathContext.DECIMAL32));
+						}
 						BigDecimal stockPrice = new BigDecimal("0.00");
 						BigDecimal surplusRouteQuantity = new BigDecimal("0.00");
 						BigDecimal balanceQuantity = new BigDecimal("0.00");
@@ -2977,7 +2985,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					// 保存订单明细
 					if (CollectionUtils.isNotEmpty(order.getOrderItemsList())) {
 						for (OrderItems orderItems : order.getOrderItemsList()) {
-							orderItems.setAmount(orderItems.getStorageInQuantity().multiply(orderItems.getPrice(), MathContext.DECIMAL32));
+							if ("XS".equals(order.getBillType())) {
+								orderItems.setAmount(orderItems.getStorageInQuantity().multiply(orderItems.getPrice(), MathContext.DECIMAL32));
+							}else{
+								orderItems.setAmount(orderItems.getStorageInQuantity().multiply(orderItems.getPurchasePrice(), MathContext.DECIMAL32));
+							}
 							orderItems.setPurchaseCost(orderItems.getPurchasePrice());
 						}
 						List<OrderItems> orderItemsList = orderItemsService.saveOrderItemsMessage(order.getOrderItemsList(), date, order.getId());
@@ -3131,7 +3143,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					// 保存订单明细
 					if (CollectionUtils.isNotEmpty(order.getOrderItemsList())) {
 						for (OrderItems orderItems : order.getOrderItemsList()) {
-							orderItems.setAmount(orderItems.getStorageInQuantity().multiply(orderItems.getPrice(), MathContext.DECIMAL32));
+							if ("XS".equals(order.getBillType())) {
+								orderItems.setAmount(orderItems.getStorageInQuantity().multiply(orderItems.getPrice(), MathContext.DECIMAL32));
+							}else{
+								orderItems.setAmount(orderItems.getStorageInQuantity().multiply(orderItems.getPurchasePrice(), MathContext.DECIMAL32));
+							}
 							BigDecimal stockPrice = new BigDecimal("0.00");
 							BigDecimal surplusRouteQuantity = new BigDecimal("0.00");
 							BigDecimal balanceQuantity = new BigDecimal("0.00");
@@ -3320,7 +3336,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					// 保存订单明细
 					if (CollectionUtils.isNotEmpty(order.getOrderItemsList())) {
 						for (OrderItems orderItems : order.getOrderItemsList()) {
-							orderItems.setAmount(orderItems.getStorageInQuantity().multiply(orderItems.getPrice(), MathContext.DECIMAL32));
+							if ("XS".equals(order.getBillType())) {
+								orderItems.setAmount(orderItems.getStorageInQuantity().multiply(orderItems.getPrice(), MathContext.DECIMAL32));
+							}else{
+								orderItems.setAmount(orderItems.getStorageInQuantity().multiply(orderItems.getPurchasePrice(), MathContext.DECIMAL32));
+							}
 							orderItems.setPurchaseCost(orderItems.getPurchasePrice());
 							//获取本商品库存
 							R<StockGoodsVO> r = stockGoodsClient.selectStockParts(null, orderItems.getStorageId(), orderItems.getItemId(), null, null, null, null, null, null);
@@ -3530,7 +3550,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					// 保存订单明细
 					if (CollectionUtils.isNotEmpty(order.getOrderItemsList())) {
 						for (OrderItems orderItems : order.getOrderItemsList()) {
-							orderItems.setAmount(orderItems.getStorageInQuantity().multiply(orderItems.getPrice(), MathContext.DECIMAL32));
+							if ("XS".equals(order.getBillType())) {
+								orderItems.setAmount(orderItems.getStorageInQuantity().multiply(orderItems.getPrice(), MathContext.DECIMAL32));
+							}else{
+								orderItems.setAmount(orderItems.getStorageInQuantity().multiply(orderItems.getPurchasePrice(), MathContext.DECIMAL32));
+							}
 							orderItems.setPurchaseCost(orderItems.getPurchasePrice());
 							//获取本商品库存
 							R<StockGoodsVO> r = stockGoodsClient.selectStockParts(null, orderItems.getStorageId(), orderItems.getItemId(), null, null, null, null, null, null);
@@ -4360,14 +4384,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	public R offset(Order order) {
 		Order selectOrder = baseMapper.selectById(order.getId());
 		if (ObjectUtils.isNotNull(selectOrder) && ObjectUtils.isNotNull(selectOrder.getCorpId())) {
-			LandOrder landOrder = new LandOrder();
-			landOrder.setCorpId(selectOrder.getCorpId());
-			R<List<LandOrder>> r = landClient.listLandOrder(landOrder);
+			R<List<Acc>> r = financeClient.selectByCorpId(selectOrder.getCorpId());
 			if (r.isSuccess() && ObjectUtils.isNotNull(r.getData())) {
-				List<LandOrder> landOrderList = r.getData();
-				BigDecimal freightPay = landOrderList.stream().map(LandOrder::getFreightPay).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
-				BigDecimal freight = landOrderList.stream().map(LandOrder::getFreight).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
-				if (selectOrder.getDebitAmount().compareTo((freightPay.add(freight))) >= 0) {
+				List<Acc> landOrderList = r.getData();
+				BigDecimal amount = landOrderList.stream().map(Acc::getAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+				BigDecimal settlementAmount = landOrderList.stream().map(Acc::getSettlementAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+				if (selectOrder.getDebitAmount().compareTo((amount.subtract(settlementAmount))) >= 0) {
 					return R.data("订单单号:" + selectOrder.getSysNo() + "金额大于/等于运费金额是否继续?");
 				} else {
 					return R.data("订单单号:" + selectOrder.getSysNo() + "金额小于运费金额,确定要审核通过吗?");
@@ -4378,6 +4400,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		} else {
 			return R.data("未查到订单信息");
 		}
+//		return R.data("确认审核通过吗?");
 	}
 
 	@Override

+ 21 - 6
blade-service/trade-finance/src/main/java/org/springblade/finance/controller/AccController.java

@@ -202,15 +202,15 @@ public class AccController extends BladeController {
 					acc_.setCurrency("CNY");
 				}
 
-				if (ObjectUtils.isNull(acc_.getItemName())){
+				if (ObjectUtils.isNull(acc_.getItemName())) {
 					acc_.setItemName("运费");
 				}
 			}
 			//录入人
 			acc_.setCreateUserName(iUserClient.userInfoById(acc_.getCreateUser()).getData().getRealName());
-			if (!"064132".equals(AuthUtil.getTenantId())){
+			if (!"064132".equals(AuthUtil.getTenantId())) {
 				//业务员
-				if(ObjectUtils.isNotNull(acc_.getShipName())){
+				if (ObjectUtils.isNotNull(acc_.getShipName())) {
 					acc_.setShipName(iUserClient.userInfoById(Long.parseLong(acc_.getShipName())).getData().getRealName());
 				}
 			}
@@ -831,15 +831,15 @@ public class AccController extends BladeController {
 					acc_.setCurrency("CNY");
 				}
 
-				if (ObjectUtils.isNull(acc_.getItemName())){
+				if (ObjectUtils.isNull(acc_.getItemName())) {
 					acc_.setItemName("运费");
 				}
 			}
 			//录入人
 			acc_.setCreateUserName(iUserClient.userInfoById(acc_.getCreateUser()).getData().getRealName());
-			if (!"064132".equals(AuthUtil.getTenantId())){
+			if (!"064132".equals(AuthUtil.getTenantId())) {
 				//业务员
-				if(ObjectUtils.isNotNull(acc_.getShipName())){
+				if (ObjectUtils.isNotNull(acc_.getShipName())) {
 					acc_.setShipName(iUserClient.userInfoById(Long.parseLong(acc_.getShipName())).getData().getRealName());
 				}
 			}
@@ -873,4 +873,19 @@ public class AccController extends BladeController {
 		return R.data(pages);
 	}
 
+	/**
+	 * 查询账单详情(通过单据id)
+	 */
+	@GetMapping("/selectByCorpId")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入acc")
+	public R<List<Acc>> selectByCorpId(@RequestParam("corpId") Long corpId) {
+		Acc acc = new Acc();
+		acc.setIsDeleted(0);
+		acc.setCorpId(corpId);
+		acc.setTenantId(SecureUtil.getTenantId());
+		List<Acc> detail = accService.list(Condition.getQueryWrapper(acc));
+		return R.data(detail);
+	}
+
 }

+ 1 - 1
blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/SettlementServiceImpl.java

@@ -2774,7 +2774,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		itemsList.forEach(e -> {
 			Acc acc = new Acc();
 			acc.setAccDate(new Date());
-			if ("申请".equals(e.getSrcFeesType())) {
+			if ("付费".equals(e.getSrcFeesType())) {
 				acc.setDc("c");
 			} else {
 				acc.setDc("d");