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

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

release_toaliyun_real
winter 1 год назад
Родитель
Сommit
1ba89b6e4c
2 измененных файлов: 6 добавлений и 1 удалений
  1. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOfflineConfigServiceImpl.java
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java

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

@@ -86,7 +86,8 @@ public class WxLegionActivityOfflineConfigServiceImpl implements WxLegionActivit
activityRecord.setOrderNo(legionActivityOrder.getOrderNo()); activityRecord.setOrderNo(legionActivityOrder.getOrderNo());
activityRecord.setOrderMoney(legionActivityOrder.getOrderMoney()); activityRecord.setOrderMoney(legionActivityOrder.getOrderMoney());
activityRecord.setCusName(legionActivityOrder.getCusName()); activityRecord.setCusName(legionActivityOrder.getCusName());
activityRecord.setCusPhone(legionActivityOrder.getCusAddress());
activityRecord.setCusPhone(legionActivityOrder.getCusPhone());
activityRecord.setCusAddress(legionActivityOrder.getCusAddress());
activityRecord.setCreateBy(legionActivityOrder.getCreateBy()); activityRecord.setCreateBy(legionActivityOrder.getCreateBy());
activityRecord.setMerchantId(legionActivityOrder.getMerchantId()); activityRecord.setMerchantId(legionActivityOrder.getMerchantId());
if(activityRecord.getMerchantId() != null){ if(activityRecord.getMerchantId() != null){


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

@@ -304,6 +304,10 @@ public class WxLegionActivityOrderServiceImpl implements WxLegionActivityOrderSe


//同步订单 //同步订单
WxLegionActivityOrder legionActivityOrder = wxLegionActivityOrderMapper.selectById(wxLegionActivityOrder.getId(), wxLegionActivityOrder.getTenantId()); WxLegionActivityOrder legionActivityOrder = wxLegionActivityOrderMapper.selectById(wxLegionActivityOrder.getId(), wxLegionActivityOrder.getTenantId());
WxLegionActivityUser user = wxLegionActivityUserMapper.selectById(legionActivityOrder.getCusId(), legionActivityOrder.getTenantId());
legionActivityOrder.setCusPhone(user.getPhone());
legionActivityOrder.setCusVipNum(user.getVipNum());

wxLegionActivityOfflineConfigService.syncOfflineActivityRecord(legionActivityOrder); wxLegionActivityOfflineConfigService.syncOfflineActivityRecord(legionActivityOrder);
} }




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