Просмотр исходного кода

Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_real_202109

release_toaliyun_real
xhxu 4 лет назад
Родитель
Сommit
e45d5d2869
3 измененных файлов: 18 добавлений и 5 удалений
  1. +10
    -0
      mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCallBackServiceImpl.java
  3. +7
    -5
      mallinkService/src/main/resources/mapper/WxCUserMapper.xml

+ 10
- 0
mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java Просмотреть файл

@@ -680,6 +680,7 @@ public class PosServiceImpl implements PosService {


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


// 2. 查找是否有退款订单 // 2. 查找是否有退款订单
WxOrder refundQ = new WxOrder(); WxOrder refundQ = new WxOrder();
refundQ.updateTenantInfo(buUser);
refundQ.setType(EnumOrderType.POSPAY.getCode()); refundQ.setType(EnumOrderType.POSPAY.getCode());
refundQ.setCUserId(memId); refundQ.setCUserId(memId);
refundQ.setPosOrderId(posOrderId); refundQ.setPosOrderId(posOrderId);


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCallBackServiceImpl.java Просмотреть файл

@@ -39,6 +39,7 @@ public class WxCallBackServiceImpl implements WxCallBackService {
PointsNotifyRequest request = new PointsNotifyRequest(); PointsNotifyRequest request = new PointsNotifyRequest();
request.setSubMchid(wxPayService.getConfig().getSubMchId()); request.setSubMchid(wxPayService.getConfig().getSubMchId());
request.setTransactionId(record.getTransactionId()); request.setTransactionId(record.getTransactionId());
request.setAppid(wxPayService.getConfig().getAppId());
request.setOpenid(record.getOpenid()); request.setOpenid(record.getOpenid());
request.setEarnPoints(true); request.setEarnPoints(true);
request.setIncreasedPoints(record.getIncreasedPoints()); request.setIncreasedPoints(record.getIncreasedPoints());


+ 7
- 5
mallinkService/src/main/resources/mapper/WxCUserMapper.xml Просмотреть файл

@@ -428,13 +428,15 @@
update wx_c_user set update_date=now(), update wx_c_user set update_date=now(),
token = null, token = null,
expire_time=now(), 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}
</update> </update>


<!-- 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"))-->



<select id="findOpenIdList" parameterType="hashmap" resultType="String" > <select id="findOpenIdList" parameterType="hashmap" resultType="String" >
select open_id from wx_c_user where user_id=#{userId} and tenant_id = #{tenantId} select open_id from wx_c_user where user_id=#{userId} and tenant_id = #{tenantId}


Загрузка…
Отмена
Сохранить