diff --git a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java index 833ee0dab..86367d84e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java @@ -110,6 +110,7 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder // logger.error("--Ali商圈付款通知消息未找到门店--mallStoreId="+record.getMallStoreId()); // } record.setMerchantId(wxMerchant.getId()); + record.setMerchantName(wxMerchant.getName()); AliPayCUser userQ = new AliPayCUser(); userQ.updateTenantInfo(record); @@ -120,6 +121,8 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder WxCUserBasicInfo infoByPhone = wxCUserBasicInfoService.registerByPhone(aliUser, aliUser.getPhone(),aliUser.getName(),null,null); if(infoByPhone != null ){ record.setCUserId(infoByPhone.getId()); + record.setCUserNickName(infoByPhone.getNickName()); + record.setCUserPhone(infoByPhone.getPhone()); }else{ logger.error("--Ali商圈付款通知消息未找到会员--aliUserId="+record.getBuyerId()); } @@ -223,7 +226,10 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder record.setAmount(order.getAmount()); record.setPayAmount(order.getPayAmount()); record.setCUserId(order.getCUserId()); + record.setCUserNickName(order.getCUserNickName()); + record.setCUserPhone(order.getCUserPhone()); record.setMerchantId(order.getMerchantId()); + record.setMerchantName(order.getMerchantName()); aliBusinessCircleOrderMapper.insertRefundNoticeOrder(record); order.setOrderStatus(2);//全额退款 订单关闭 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java index 1281091ee..ceec43d40 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java @@ -106,6 +106,7 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe WxMerchant wxMerchant = wxMerchantService.getMerchantByEncode(record.getWxShopNumber()); if (wxMerchant != null) { record.setMerchantId(wxMerchant.getId()); + record.setMerchantName(wxMerchant.getName()); } else { logger.error("--wx商圈付款通知消息未找到门店--shopName=" + record.getWxShopName() + "&shopNumber=" + record.getWxShopNumber()); } @@ -116,6 +117,8 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe WxCUser user = wxCUserService.getByOpenId(userQ); if (user != null && user.getUserId() != null) { record.setCUserId(user.getUserId()); + record.setCUserNickName(user.getNickName()); + record.setCUserPhone(user.getPhone()); } else { logger.error("--Wx商圈付款通知消息未找到会员--openid=" + record.getOpenid()); } @@ -209,7 +212,10 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe record.setUpdateTime(now); record.setCUserId(order.getCUserId()); + record.setCUserNickName(order.getCUserNickName()); + record.setCUserPhone(order.getCUserPhone()); record.setMerchantId(order.getMerchantId()); + record.setMerchantName(order.getMerchantName()); wxBusinessCircleOrderMapper.insertRefundNoticeOrder(record); if((refundAmount + record.getRefundAmount()) == amount){ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java index 6a97822af..4b784770d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java @@ -117,10 +117,12 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService WxMerchant wxMerchant = wxMerchantService.getMerchantByEncode(record.getShopNumber()); if(wxMerchant != null){ record.setMerchantId(wxMerchant.getId()); - record.setShopName(wxMerchant.getName()); + record.setMerchantName(wxMerchant.getName()); +// record.setShopName(wxMerchant.getName()); }else{ if(StringUtils.isBlank(record.getShopName())){ - record.setShopName("第三方门店"); +// record.setShopName("第三方门店"); + record.setMerchantName("未知门店"); } logger.info("--第三方付款通知消息未找到门店--shopName="+record.getShopName()+"&shopNumber="+record.getShopNumber()); } @@ -139,6 +141,8 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService if(basicInfo != null){ record.setCUserId(basicInfo.getId()); + record.setCUserNickName(basicInfo.getNickName()); + record.setCUserPhone(basicInfo.getPhone()); }else{ logger.error("--第三方付款通知消息未找到会员--userPhone="+record.getUserPhone()+"$userNumer="+record.getId()); } @@ -257,7 +261,10 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService record.setAmount(order.getAmount()); record.setPayAmount(order.getPayAmount()); record.setCUserId(order.getCUserId()); + record.setCUserNickName(order.getCUserNickName()); + record.setCUserPhone(order.getCUserPhone()); record.setMerchantId(order.getMerchantId()); + record.setMerchantName(order.getMerchantName()); wxThirdPartyOrdersMapper.insertRefundNoticeOrder(record); if((refundAmount + record.getRefundAmount()) == amount){ @@ -347,6 +354,8 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService } record.setCUserId(basicInfo.getId()); + record.setCUserNickName(basicInfo.getNickName()); + record.setCUserPhone(basicInfo.getPhone()); String lockKey = StringUtils.join(THIRD_CIRCLE_KEY,record.getTransactionId(), ":CP:", "lock"); long time = System.currentTimeMillis() + 2000; @@ -371,10 +380,12 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService WxMerchant wxMerchant = wxMerchantService.getMerchantByEncode(record.getShopNumber()); if(wxMerchant != null){ record.setMerchantId(wxMerchant.getId()); - record.setShopName(wxMerchant.getName()); + record.setMerchantName(wxMerchant.getName()); +// record.setShopName(wxMerchant.getName()); }else{ if(StringUtils.isBlank(record.getShopName())){ - record.setShopName("第三方门店"); +// record.setShopName("第三方门店"); + record.setMerchantName("未知门店"); } logger.info("--第三方积分抵扣未找到门店--shopName="+record.getShopName()+"&shopNumber="+record.getShopNumber()); }