flowerbackend-v2.git

			@@ -44,7 +44,6 @@
			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;
			@@ -100,9 +99,6 @@

			@Autowired
			private UserPaymentV3Service paymentV3Service;

			@Autowired
			private UserPaymentSybService paymentSybService;

			@Autowired
			private SequenceNo sequenceNo;
			@@ -469,7 +465,6 @@
			}
			});

			/* 替换支付修改
			WxMaJscode2SessionResult session = null;
			try {
			session = weChatService.getWxMaSessionInfo(dto.getWxcode());
			@@ -480,7 +475,6 @@
			if (StringUtils.isBlank(openId)) {
			throw new ValidationException("微信登录失败");
			}
			*/

			Address address = addressMapper.selectById(dto.getAddressId());
			List<TransportOrderDTO> tLs = transportService.getPreOrderTransportList(address
			@@ -501,6 +495,19 @@
			usePointGoods(order.getId(), goodsRecordIdList);//使用积分商品兑换券

			order.create(userId);
			// 根据当前的时间判断，如果时间大于当天的下午17:00 ，那么日期则为下一天的日期，否则为当天日期
			if(null!=order.getCreateTime()){
			LocalDateTime createDateTime = order.getCreateTime();
			LocalDate createDate = createDateTime.toLocalDate();
			LocalDateTime today1700 = createDateTime.with(LocalTime.of(17, 0));
			// 比较时间是否大于当天的 17:00
			if (createDateTime.isAfter(today1700)) {
			// 如果大于 17:00，设置为下一天的日期
			createDate = createDate.plusDays(1);
			}
			order.setCreateDateSta(createDate);
			}
			// order.setCreateDate();
			order.setRemarks(dto.getRemarks());
			order.setSpecialNeeds(dto.getSpecialNeeds());
			order.setStatusBackend(Constants.ORDER_STATUS_BACKEND.PENDING.name());
			@@ -534,7 +541,7 @@
			}
			totalAmount = totalAmount.add(p.getPacking()).add(transportFee);
			if(totalAmount.doubleValue() <= 0){//假如总价小于等于0，则支付0.01元
			totalAmount = new BigDecimal(0.01);
			totalAmount = new BigDecimal("0.01");
			}
			order.setTotalAmount(totalAmount);

			@@ -611,7 +618,7 @@
			}

			order.setOrderNo(getOrderNo());
			//order.setPayOpenid(openId);替换支付修改
			order.setPayOpenid(openId);
			orderMapper.insert(order);

			//处理积分商品兑换券
			@@ -626,7 +633,9 @@
			}
			}

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

			private void usePointGoods(String orderId, List<Long> goodsRecordIdList){
			@@ -779,7 +788,6 @@
			if(orders == null \|\| orders.size() == 0){
			return;
			}
			/*
			for (Order o : orders) {
			//set status_backend = 'RECEIVE', status = 'RECEIVE'
			o.setStatusBackend("RECEIVE");
			@@ -796,8 +804,7 @@

			orderMapper.updateById(o);
			}
			*/
			orderMapper.setPartnerOrderReceive();
			//orderMapper.setPartnerOrderReceive();
			}

			/**
			@@ -818,7 +825,6 @@
			o.setStatusBackend(Constants.ORDER_STATUS_BACKEND.RECEIVE.name());
			o.update(SecurityUtils.getUserId());

			/*
			//发送微信发货请求
			JSONObject jsonObject = sendWxDeliveryGood(o);
			if (jsonObject != null && (int) jsonObject.get("errcode") == 0) {
			@@ -828,7 +834,7 @@
			o.setWxDeliveryGood(false);
			o.setWxDeliveryMsg(GsonUtil.toJson(jsonObject));
			}
			*/

			orderMapper.updateById(o);
			}

			@@ -928,6 +934,10 @@
			orderIds.add(o.getId());

			OrderPlatformListDTO p = new OrderPlatformListDTO();
			//增加订单扎数
			Integer sumNumByOrderId = orderItemMapper.getSumNumByOrderId(o.getId());
			o.setSaleNum(sumNumByOrderId);

			BeanUtils.copyProperties(o, p);
			result.add(p);
			}
			@@ -1242,7 +1252,6 @@
			customerPointService.consumptionPoint(totalAmount, o.getOrderNo(), o.getCreateBy());
			}

			/*
			public JSONObject sendWxDeliveryGood(Order o) {
			JSONObject json = new JSONObject();
			List<OrderItem> items = orderItemMapper.selectList(new LambdaQueryWrapper<OrderItem>()
			@@ -1281,7 +1290,6 @@
			return json;
			}
			}
			*/

			public Order confirmOrderReceive(String id) {
			Order o = orderMapper.selectById(id);
			@@ -1475,7 +1483,7 @@

			transferId = "NoNeedRefund";
			if (deductAmount.doubleValue() > 0) {
			transferId = paymentSybService.refundOrderSub(o, deductAmount);
			transferId = paymentV3Service.refundOrderSub(o, deductAmount);
			}
			o.setTransferId(transferId);
			orderMapper.updateById(o);
			@@ -1496,7 +1504,7 @@
			}

			BigDecimal amount = dto.getAmount();
			transferId = paymentSybService.refundOrderSub(o, amount);
			transferId = paymentV3Service.refundOrderSub(o, amount);
			o.setTransferId(transferId);
			o.setTransferTime(LocalDateTime.now());
			o.update(SecurityUtils.getUserId());
			@@ -1761,7 +1769,7 @@
			public void exportOrderDetail(HttpServletResponse response, OrderQueryDTO dto) {
			List<OrderListExportDTO> ls = getOrderExportListBase( dto);
			String[] rowsName = new String[]{"序号","订单号", "用户账号", "收货人", "收货人电话", "收货地址", "订单金额"
			, "底价", "订单状态", "下单时间", "合伙人", "库位", "特殊需求", "备注"};
			, "底价","销售扎数", "订单状态", "下单时间", "合伙人", "库位", "特殊需求", "备注"};
			List<Object[]> dataList = new ArrayList<>();
			int sn = 1;
			for (OrderListExportDTO o : ls) {
			@@ -1775,6 +1783,7 @@
			objs[a++] = o.getCustomerAddress();
			objs[a++] = o.getTotalAmount();
			objs[a++] = o.getSupplierAmount();
			objs[a++] = o.getSaleNum();
			objs[a++] = o.getStatusBackendStr();
			objs[a++] = o.getCreateTime();
			objs[a++] = o.getPartnerName();
			@@ -1802,4 +1811,11 @@
			exportOrderDetail(response, dto);
			}

			public void refreshDate() {
			List<Order> allOrderList= orderMapper.selectAllDateList();

			allOrderList.forEach(order -> {
			orderMapper.updatePaymentCreateDate(order);
			});
			}
			}