|
|
|
@@ -680,6 +680,7 @@ public class PosServiceImpl implements PosService { |
|
|
|
|
|
|
|
// 5. 检查适用门店 |
|
|
|
WxCouponMerchant wxCouponMerchant = new WxCouponMerchant(); |
|
|
|
wxCouponMerchant.updateTenantInfo(tenantinfo); |
|
|
|
wxCouponMerchant.setProductId(couponOrderCVo.getCouponId()); |
|
|
|
wxCouponMerchant.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode()); |
|
|
|
List<WxCouponMerchant> couponMerchantList = couponMerchantMapper.findList(wxCouponMerchant); |
|
|
|
@@ -1078,6 +1079,7 @@ public class PosServiceImpl implements PosService { |
|
|
|
} |
|
|
|
// 5. 检查适用门店 |
|
|
|
WxCouponMerchant wxCouponMerchant = new WxCouponMerchant(); |
|
|
|
wxCouponMerchant.updateTenantInfo(couponOrderCVo); |
|
|
|
wxCouponMerchant.setProductId(couponOrderCVo.getCouponId()); |
|
|
|
wxCouponMerchant.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode()); |
|
|
|
List<WxCouponMerchant> couponMerchantList = couponMerchantMapper.findList(wxCouponMerchant); |
|
|
|
@@ -1288,6 +1290,7 @@ public class PosServiceImpl implements PosService { |
|
|
|
// 2. update couponOrder |
|
|
|
try { |
|
|
|
WxCouponOrder couponOrder = new WxCouponOrder(); |
|
|
|
couponOrder.updateTenantInfo(couponOrderCVo); |
|
|
|
couponOrder.setId(couponOrderCVo.getId()); |
|
|
|
couponOrder.updateTenantInfo(couponOrderCVo); |
|
|
|
couponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); |
|
|
|
@@ -2138,6 +2141,7 @@ public class PosServiceImpl implements PosService { |
|
|
|
// 1. insert into PayOrder |
|
|
|
WxPayOrder payOrderQ = new WxPayOrder(); |
|
|
|
payOrderQ.setOrderId(order.getId()); |
|
|
|
payOrderQ.updateTenantInfo(merchantBUser); |
|
|
|
List<WxPayOrder> payOrderList = payOrderMapper.findList(payOrderQ); |
|
|
|
WxPayOrder payOrder = null; |
|
|
|
if (null == payOrderList || payOrderList.size()<=0) { |
|
|
|
@@ -2178,6 +2182,7 @@ public class PosServiceImpl implements PosService { |
|
|
|
// 2. 预核销->核销 |
|
|
|
if (sceneType.equals(EnumPosSceneType.PAY.getCode())) { |
|
|
|
WxCouponOrder updateCO = new WxCouponOrder(); |
|
|
|
updateCO.updateTenantInfo(merchantBUser); |
|
|
|
updateCO.setId(couponOrderId); |
|
|
|
updateCO.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); |
|
|
|
updateCO.setPayVendor(EnumPayWay.PAY_WAY_POS_NEU.getCode()); |
|
|
|
@@ -2232,6 +2237,7 @@ public class PosServiceImpl implements PosService { |
|
|
|
Long posPayOrderId, Integer neuPaymentAmount, Date neuPosPayOrderTime, String posPayOrderNo) { |
|
|
|
// 1. insert into PayOrder |
|
|
|
WxPayOrder payOrderQ = new WxPayOrder(); |
|
|
|
payOrderQ.updateTenantInfo(buUser); |
|
|
|
payOrderQ.setOrderId(order.getId()); |
|
|
|
List<WxPayOrder> payOrderList = payOrderMapper.findList(payOrderQ); |
|
|
|
WxPayOrder payOrder = null; |
|
|
|
@@ -2307,6 +2313,7 @@ public class PosServiceImpl implements PosService { |
|
|
|
Integer neuPayOrderType, Long neuPayOrderId, Integer neuPaymentAmount, Date neuPosPayOrderTime, String neuPayThirdNo) { |
|
|
|
// 1. insert into PayOrder |
|
|
|
WxPayOrder payOrderQ = new WxPayOrder(); |
|
|
|
payOrderQ.updateTenantInfo(buUser); |
|
|
|
payOrderQ.setOrderId(order.getId()); |
|
|
|
List<WxPayOrder> payOrderList = payOrderMapper.findList(payOrderQ); |
|
|
|
WxPayOrder payOrder = null; |
|
|
|
@@ -2451,6 +2458,7 @@ public class PosServiceImpl implements PosService { |
|
|
|
) { |
|
|
|
boolean isExist = true; |
|
|
|
WxOrder orderQ = new WxOrder(); |
|
|
|
orderQ.updateTenantInfo(merchantBUser); |
|
|
|
orderQ.setType(EnumOrderType.POSPAY.getCode()); |
|
|
|
orderQ.setCUserId(memId); |
|
|
|
orderQ.setPaymentType(EnumPayType.PAY_PAYMENT.getCode()); |
|
|
|
@@ -2513,6 +2521,7 @@ public class PosServiceImpl implements PosService { |
|
|
|
) { |
|
|
|
// 1. 查找正向订单 |
|
|
|
WxOrder orderQ = new WxOrder(); |
|
|
|
orderQ.updateTenantInfo(buUser); |
|
|
|
orderQ.setType(EnumOrderType.POSPAY.getCode()); |
|
|
|
orderQ.setCUserId(memId); |
|
|
|
orderQ.setPaymentType(EnumPayType.PAY_PAYMENT.getCode()); |
|
|
|
@@ -2530,6 +2539,7 @@ public class PosServiceImpl implements PosService { |
|
|
|
|
|
|
|
// 2. 查找是否有退款订单 |
|
|
|
WxOrder refundQ = new WxOrder(); |
|
|
|
refundQ.updateTenantInfo(buUser); |
|
|
|
refundQ.setType(EnumOrderType.POSPAY.getCode()); |
|
|
|
refundQ.setCUserId(memId); |
|
|
|
refundQ.setPosOrderId(posOrderId); |
|
|
|
|