Browse Source

[收银台][修改]:收银台bug修复

release_toaliyun_real
Stormeye Wu 6 years ago
parent
commit
f9d7608116
5 changed files with 9 additions and 7 deletions
  1. +2
    -0
      mallinkAdmin/src/main/resources/db/migration/V201910312205__ALTER_ORDER.sql
  2. +2
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java
  3. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  5. +2
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java

+ 2
- 0
mallinkAdmin/src/main/resources/db/migration/V201910312205__ALTER_ORDER.sql View File

@@ -0,0 +1,2 @@
ALTER TABLE `wx_order`
CHANGE COLUMN `real_payment` `total_payment` int(11) NULL COMMENT '总计支付金额';

+ 2
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java View File

@@ -417,9 +417,10 @@ public class WxMicroPayController extends BaseController {
try {
couponPayOrder = wxCouponOrderService.microPayPreVerify(microOrder, wxCouponOrder, wxMerchantBUser, payPrice);
remainPrice = microOrder.getPayment() - couponPayOrder.getPayAmount();
// 更新实际支付金额
WxOrder updateOrder = new WxOrder();
updateOrder.setId(microOrder.getId());
updateOrder.setRealPayment(remainPrice);
updateOrder.setPayment(remainPrice);
wxOrderService.saveOrUpdate(updateOrder);
} catch (MallinkException e) {
logger.error("核销异常: " + e.getMessage());


+ 2
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java View File

@@ -91,8 +91,8 @@ public class WxOrder extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="POS SN",name="posOrderCreateSn")
private String posOrderCreateSn;

@io.swagger.annotations.ApiModelProperty(value="实际支付金额(分),收银台用券时使用",name="realPayment")
private Integer realPayment;
@io.swagger.annotations.ApiModelProperty(value="总计支付金额(分),收银台用券时使用",name="totalPayment")
private Integer totalPayment;

@TableField(exist = false)
protected List<Integer> statusS;


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java View File

@@ -595,7 +595,7 @@ public class WxOrderServiceImpl implements WxOrderService {
record.setProductId(user.getId());
record.setPaymentType(EnumPayType.PAY_PAYMENT.getCode());
record.setPayment(payment);
record.setRealPayment(payment);
record.setTotalPayment(payment);
record.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode());
record.setDetail(bodyStr);
record.setCreateDate(curr);


+ 2
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java View File

@@ -1316,7 +1316,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {

WxAppinfo appinfo = wxAppinfoService.getCAppInfo(order.getTenantId());

// add c_user
// add c_user, 收银台支付和券支付可能不是同一个人
Date curDate = new Date();
WxCUser userQ = new WxCUser();
userQ.setOpenId(openId);
@@ -1360,10 +1360,9 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "支付订单数据库更新失败: " + e.getMessage());
}

// B端收银台核销券处理
// B端收银台核销券处理, 收银台支付和券支付可能不是同一个人
WxPayOrder payOrderQ = new WxPayOrder();
payOrderQ.setOrderId(order.getId());
payOrderQ.setCUserId(userQ.getId());
payOrderQ.setPayFrom(EnumPayFrom.INSIDE_B.getCode());
payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_WAIT.getCode());
try {


Loading…
Cancel
Save