flowerbackend-v2.git

			@@ -44,6 +44,7 @@
			import com.mzl.flower.mapper.supplier.StationMapper;
			import com.mzl.flower.mapper.system.UserWechatMapper;
			import com.mzl.flower.mapper.warehouse.WarehouseLocationMapper;
			import com.mzl.flower.pay.SybPayService;
			import com.mzl.flower.service.BaseService;
			import com.mzl.flower.service.comment.FlowerCommentService;
			import com.mzl.flower.service.coupon.CouponRecordService;
			@@ -99,6 +100,9 @@

			@Autowired
			private UserPaymentV3Service paymentV3Service;

			@Autowired
			private UserPaymentSybService paymentSybService;

			@Autowired
			private SequenceNo sequenceNo;
			@@ -453,7 +457,7 @@
			}
			}

			public Map commitOrder(OrderCommitDTO dto, PreOrderDTO p, Map<Long, PriceDTO> priceMap) {
			public Map commitOrder(OrderCommitDTO dto, PreOrderDTO p, Map<Long, PriceDTO> priceMap) throws Exception {
			String userId = SecurityUtils.getUserId();
			p.getFlowers().forEach(flower -> {
			// 限购数量鲜花数量校验
			@@ -620,8 +624,9 @@
			}
			}

			Map map = paymentV3Service.wxPrepay(order);
			Map map = paymentSybService.prepay(order);
			map.put("_testV2OrderId", order.getId());

			return map;
			}

			@@ -1432,7 +1437,7 @@
			return dto;
			}

			public void processAbnormalOrder(String id) {
			public void processAbnormalOrder(String id) throws Exception {
			Order o = orderMapper.selectById(id);
			String transferId = o.getTransferId();
			if (StringUtils.isNotEmpty(transferId)) {
			@@ -1471,13 +1476,13 @@

			transferId = "NoNeedRefund";
			if (deductAmount.doubleValue() > 0) {
			transferId = paymentV3Service.refundOrderSub(o, deductAmount);
			transferId = paymentSybService.refundOrderSub(o, deductAmount);
			}
			o.setTransferId(transferId);
			orderMapper.updateById(o);
			}

			public void processLevelDown(OrderReduceDTO dto) {
			public void processLevelDown(OrderReduceDTO dto) throws Exception {
			Order o = orderMapper.selectById(dto.getId());
			String transferId = o.getTransferId();
			if (StringUtils.isNotEmpty(transferId)) {
			@@ -1492,7 +1497,7 @@
			}

			BigDecimal amount = dto.getAmount();
			transferId = paymentV3Service.refundOrderSub(o, amount);
			transferId = paymentSybService.refundOrderSub(o, amount);
			o.setTransferId(transferId);
			o.setTransferTime(LocalDateTime.now());
			o.update(SecurityUtils.getUserId());