From 9d25fcb829f5660b0ba1ead2e36e005fa7303771 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 5 Aug 2021 17:49:35 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=A7=AF=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxCallBackServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCallBackServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCallBackServiceImpl.java index 1fa8674e3..9f1f0058f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCallBackServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCallBackServiceImpl.java @@ -39,6 +39,7 @@ public class WxCallBackServiceImpl implements WxCallBackService { PointsNotifyRequest request = new PointsNotifyRequest(); request.setSubMchid(wxPayService.getConfig().getSubMchId()); request.setTransactionId(record.getTransactionId()); + request.setAppid(wxPayService.getConfig().getAppId()); request.setOpenid(record.getOpenid()); request.setEarnPoints(true); request.setIncreasedPoints(record.getIncreasedPoints()); From 30a70d590eb5f95e0fd5cd0696fd79745829539f Mon Sep 17 00:00:00 2001 From: xhxu Date: Sat, 7 Aug 2021 16:26:20 +0800 Subject: [PATCH 2/4] pos --- .../src/main/java/com/iformall/service/impl/PosServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java index b762e5ccf..70833822e 100644 --- a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java +++ b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java @@ -2451,6 +2451,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()); From 0274e612c082f510402abc17a6b44fc5ad1c03bd Mon Sep 17 00:00:00 2001 From: xhxu Date: Sat, 7 Aug 2021 17:06:34 +0800 Subject: [PATCH 3/4] pos updateTenantInfo --- .../java/com/iformall/service/impl/PosServiceImpl.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java index 70833822e..7a7528522 100644 --- a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java +++ b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java @@ -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 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 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 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 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 payOrderList = payOrderMapper.findList(payOrderQ); WxPayOrder payOrder = null; @@ -2514,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()); @@ -2531,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); From 2f4b2b229a69e66a37f5667b863bc70db19cf03e Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 10 Aug 2021 13:37:19 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8E=88=E6=9D=83=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxCUserMapper.xml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml index 1305e23cc..c1cd74047 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml @@ -428,13 +428,15 @@ update wx_c_user set update_date=now(), token = null, expire_time=now(), - tenant_id = IF(tenant_id is null ,null,CONCAT(tenant_id,"_del")), - parent_tenant_id = IF(parent_tenant_id is null ,null,CONCAT(parent_tenant_id,"_del")), - open_id = IF(open_id is null ,null,CONCAT(open_id,"_del")), - union_id = IF(union_id is null ,null,CONCAT(union_id,"_del")) - where user_id = #{userId} and tenant_id = #{tenantId} and id != #{id} + user_id = null + where user_id = #{userId} and tenant_id = #{tenantId} and id != #{id} + + + + +