结算方式
parent
f35e6219ce
commit
459301fca2
|
|
@ -20,17 +20,17 @@ import com.njzscloud.supervisory.order.contant.MoneyWay;
|
|||
import com.njzscloud.supervisory.order.contant.OrderStatus;
|
||||
import com.njzscloud.supervisory.order.contant.PaymentStatus;
|
||||
import com.njzscloud.supervisory.order.contant.SettlementWay;
|
||||
import com.njzscloud.supervisory.order.pojo.entity.OrderGoodsEntity;
|
||||
import com.njzscloud.supervisory.order.service.OrderGoodsService;
|
||||
import com.njzscloud.supervisory.wxPay.dto.RefundRequestDto;
|
||||
import com.njzscloud.supervisory.order.pojo.entity.OrderExpenseItemsEntity;
|
||||
import com.njzscloud.supervisory.order.pojo.entity.OrderGoodsEntity;
|
||||
import com.njzscloud.supervisory.order.pojo.entity.OrderInfoEntity;
|
||||
import com.njzscloud.supervisory.order.pojo.param.PaymentItemParam;
|
||||
import com.njzscloud.supervisory.wxPay.param.PaymentParam;
|
||||
import com.njzscloud.supervisory.order.pojo.result.PaymentContextResult;
|
||||
import com.njzscloud.supervisory.order.service.OrderExpenseItemsService;
|
||||
import com.njzscloud.supervisory.order.service.OrderGoodsService;
|
||||
import com.njzscloud.supervisory.order.service.OrderInfoService;
|
||||
import com.njzscloud.supervisory.wxPay.config.WxPayProperties;
|
||||
import com.njzscloud.supervisory.wxPay.dto.RefundRequestDto;
|
||||
import com.njzscloud.supervisory.wxPay.param.PaymentParam;
|
||||
import com.njzscloud.supervisory.wxPay.service.PaymentService;
|
||||
import com.njzscloud.supervisory.wxPay.service.WeChatPayService;
|
||||
import com.njzscloud.supervisory.wxPay.utils.RequestHolder;
|
||||
|
|
@ -204,21 +204,22 @@ public class PaymentController {
|
|||
WxPayOrderNotifyResult notifyResult = wxPayService.parseOrderNotifyResult(xmlData);
|
||||
String orderSn = extractOrderIdFromOutTradeNo(notifyResult.getOutTradeNo());
|
||||
if (orderSn != null) {
|
||||
orderInfoService.lambdaUpdate()
|
||||
.eq(OrderInfoEntity::getSn, orderSn)
|
||||
.set(OrderInfoEntity::getPaymentStatus, PaymentStatus.YiZhiFu)
|
||||
.set(OrderInfoEntity::getOrderStatus, OrderStatus.YiWanCheng)
|
||||
.set(OrderInfoEntity::getPayTime, LocalDateTime.now())
|
||||
.update();
|
||||
|
||||
OrderInfoEntity entity = orderInfoService.getOne(Wrappers.<OrderInfoEntity>lambdaQuery().eq(OrderInfoEntity::getSn, orderSn));
|
||||
log.info("微信支付成功,商户订单号:{},微信交易号:{}",
|
||||
orderSn, notifyResult.getTransactionId());
|
||||
OrderInfoEntity entity = orderInfoService.getOne(Wrappers.<OrderInfoEntity>lambdaQuery().eq(OrderInfoEntity::getSn, orderSn));
|
||||
if (entity == null) {
|
||||
log.info("订单信息不存在:{}", orderSn);
|
||||
} else {
|
||||
OrderGoodsEntity orderGoodsEntity = orderGoodsService.getById(entity.getGoodsId());
|
||||
if (MoneyWay.OUT.getVal().equals(orderGoodsEntity.getMoneyWay())) {
|
||||
String moneyWay = orderGoodsEntity.getMoneyWay();
|
||||
boolean out = MoneyWay.OUT.getVal().equals(moneyWay);
|
||||
orderInfoService.lambdaUpdate()
|
||||
.eq(OrderInfoEntity::getSn, orderSn)
|
||||
.set(OrderInfoEntity::getPaymentStatus, PaymentStatus.YiZhiFu)
|
||||
.set(OrderInfoEntity::getOrderStatus, out ? OrderStatus.YiWanCheng : null)
|
||||
.set(OrderInfoEntity::getPayTime, LocalDateTime.now())
|
||||
.update();
|
||||
if (out) {
|
||||
DeviceInfoService.open(orderSn);
|
||||
}
|
||||
}
|
||||
|
|
@ -305,4 +306,4 @@ public class PaymentController {
|
|||
return WxPayNotifyResponse.fail(e.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue