flowerbackend-v2.git

			@@ -130,19 +130,21 @@
			}
			String type = settlement.getType();

			String name = "";
			if(Constants.SETTLEMENT_TYPE.supplier.name().equals(type)){
			Supplier s = supplierMapper.selectOne(new QueryWrapper<Supplier>()
			.eq("user_id", settlement.getUserId()));
			name = "供应商" + s.getName();
			} else {
			Partner p = partnerMapper.selectOne(new QueryWrapper<Partner>()
			.eq("user_id", settlement.getUserId()));
			name = "合伙人" + p.getName();
			}

			UserWechat wechat = wechatMapper.selectOne(new QueryWrapper<UserWechat>()
			.eq("user_id", settlement.getUserId()));
			if(wechat == null){
			String msg;
			if(Constants.SETTLEMENT_TYPE.supplier.name().equals(type)){
			Supplier s = supplierMapper.selectOne(new QueryWrapper<Supplier>()
			.eq("user_id", settlement.getUserId()));
			msg = "供应商" + s.getName() + "未绑定账号无法结算";
			} else {
			Partner p = partnerMapper.selectOne(new QueryWrapper<Partner>()
			.eq("user_id", settlement.getUserId()));
			msg = "合伙人" + p.getName() + "未绑定账号无法结算";
			}
			String msg = name + "未绑定账号无法结算";
			log.error(msg);
			throw new ValidationException(msg);
			}
			@@ -151,8 +153,7 @@
			LocalDateTime now = LocalDateTime.now();
			String day = format(now, "yyyy-MM-dd");

			String remarks = Constants.SETTLEMENT_TYPE.supplier.name().equals(type)
			? "供应商账单结算" : "合伙人账单结算";
			String remarks = name + "账单结算";

			String appId = Constants.SETTLEMENT_TYPE.supplier.name().equals(type)
			? PyamentV3Configurer.supplier_app_id : PyamentV3Configurer.partner_app_id;

			@@ -45,7 +45,7 @@
			SELECT ois.order_item_id, oi.flower_name, oi.flower_level, oi.num, oi.supplier_price price , s.`status`
			, ois.check_num, ois.check_fee, ois.replace_num, ois.replace_fee, ois.lack_num, ois.lack_fee_supplier lackFee
			, ois.station_fee, ois.sales_fee_supplier salesFee, ois.service_fee_rate, ois.service_fee
			, ois.income_supplier income, o.status_backend, o.create_time orderTime
			, ois.income_supplier income, o.status_backend, o.create_time orderTime, o.receive_time
			, (select count(1) from t_order_item_sales sa where sa.order_item_id = oi.id) salesNum
			FROM t_delivery_order_item doi
			join t_delivery_order q on q.id = doi.delivery_id

	src/main/java/com/mzl/flower/dto/response/payment/DeliveryOrderItemSettlementDTO.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/mzl/flower/service/payment/OrderSettlementService.java	25 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/mapper/payment/DeliveryOrderItemMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -78,4 +78,7 @@

			@ApiModelProperty(value = "下单时间")
			private LocalDateTime orderTime;

			@ApiModelProperty(value = "收货时间")
			private LocalDateTime receiveTime;
			}