| @@ -0,0 +1,2 @@ | |||||
| ALTER TABLE `wx_order` | |||||
| CHANGE COLUMN `real_payment` `total_payment` int(11) NULL COMMENT '总计支付金额'; | |||||
| @@ -417,9 +417,10 @@ public class WxMicroPayController extends BaseController { | |||||
| try { | try { | ||||
| couponPayOrder = wxCouponOrderService.microPayPreVerify(microOrder, wxCouponOrder, wxMerchantBUser, payPrice); | couponPayOrder = wxCouponOrderService.microPayPreVerify(microOrder, wxCouponOrder, wxMerchantBUser, payPrice); | ||||
| remainPrice = microOrder.getPayment() - couponPayOrder.getPayAmount(); | remainPrice = microOrder.getPayment() - couponPayOrder.getPayAmount(); | ||||
| // 更新实际支付金额 | |||||
| WxOrder updateOrder = new WxOrder(); | WxOrder updateOrder = new WxOrder(); | ||||
| updateOrder.setId(microOrder.getId()); | updateOrder.setId(microOrder.getId()); | ||||
| updateOrder.setRealPayment(remainPrice); | |||||
| updateOrder.setPayment(remainPrice); | |||||
| wxOrderService.saveOrUpdate(updateOrder); | wxOrderService.saveOrUpdate(updateOrder); | ||||
| } catch (MallinkException e) { | } catch (MallinkException e) { | ||||
| logger.error("核销异常: " + e.getMessage()); | logger.error("核销异常: " + e.getMessage()); | ||||
| @@ -91,8 +91,8 @@ public class WxOrder extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="POS SN",name="posOrderCreateSn") | @io.swagger.annotations.ApiModelProperty(value="POS SN",name="posOrderCreateSn") | ||||
| private String 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) | @TableField(exist = false) | ||||
| protected List<Integer> statusS; | protected List<Integer> statusS; | ||||
| @@ -595,7 +595,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| record.setProductId(user.getId()); | record.setProductId(user.getId()); | ||||
| record.setPaymentType(EnumPayType.PAY_PAYMENT.getCode()); | record.setPaymentType(EnumPayType.PAY_PAYMENT.getCode()); | ||||
| record.setPayment(payment); | record.setPayment(payment); | ||||
| record.setRealPayment(payment); | |||||
| record.setTotalPayment(payment); | |||||
| record.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); | record.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); | ||||
| record.setDetail(bodyStr); | record.setDetail(bodyStr); | ||||
| record.setCreateDate(curr); | record.setCreateDate(curr); | ||||
| @@ -1316,7 +1316,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||||
| WxAppinfo appinfo = wxAppinfoService.getCAppInfo(order.getTenantId()); | WxAppinfo appinfo = wxAppinfoService.getCAppInfo(order.getTenantId()); | ||||
| // add c_user | |||||
| // add c_user, 收银台支付和券支付可能不是同一个人 | |||||
| Date curDate = new Date(); | Date curDate = new Date(); | ||||
| WxCUser userQ = new WxCUser(); | WxCUser userQ = new WxCUser(); | ||||
| userQ.setOpenId(openId); | userQ.setOpenId(openId); | ||||
| @@ -1360,10 +1360,9 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||||
| throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "支付订单数据库更新失败: " + e.getMessage()); | throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "支付订单数据库更新失败: " + e.getMessage()); | ||||
| } | } | ||||
| // B端收银台核销券处理 | |||||
| // B端收银台核销券处理, 收银台支付和券支付可能不是同一个人 | |||||
| WxPayOrder payOrderQ = new WxPayOrder(); | WxPayOrder payOrderQ = new WxPayOrder(); | ||||
| payOrderQ.setOrderId(order.getId()); | payOrderQ.setOrderId(order.getId()); | ||||
| payOrderQ.setCUserId(userQ.getId()); | |||||
| payOrderQ.setPayFrom(EnumPayFrom.INSIDE_B.getCode()); | payOrderQ.setPayFrom(EnumPayFrom.INSIDE_B.getCode()); | ||||
| payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_WAIT.getCode()); | payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_WAIT.getCode()); | ||||
| try { | try { | ||||