Pārlūkot izejas kodu

fix

release_toaliyun_real
winter pirms 6 mēnešiem
vecāks
revīzija
5d1f7fe9c3
2 mainītis faili ar 16 papildinājumiem un 4 dzēšanām
  1. +4
    -4
      mallinkBApi/src/main/java/com/iformall/controller/WxVtwoActivityOrderController.java
  2. +12
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOfflineConfigServiceImpl.java

+ 4
- 4
mallinkBApi/src/main/java/com/iformall/controller/WxVtwoActivityOrderController.java Parādīt failu

@@ -70,23 +70,23 @@ public class WxVtwoActivityOrderController extends BaseController {
if(!EnumOfflineActivityRecordStatus.AUDT_FAIL.getCode().equals(record.getAuditStatus())){
throw new MallinkException(Result.ERROR,"订单状态不允许修改");
}
if (null != activityOrder.getFromOrderId()) {
if (null != activityOrder.getFromOrderId() && activityOrder.getFromOrderId() > 0) {
WxVtwoActivityOrder fromOrderQuery = new WxVtwoActivityOrder();
fromOrderQuery.updateTenantInfo(tenantEntity);
fromOrderQuery.setFromOrderId(activityOrder.getFromOrderId());
fromOrderQuery.setNotInId(activityOrder.getId());
WxVtwoActivityOrder frecord = wxVtwoActivityOrderService.getlimitOne(activityOrder);
WxVtwoActivityOrder frecord = wxVtwoActivityOrderService.getlimitOne(fromOrderQuery);
if (null != frecord) {
throw new MallinkException(Result.ERROR,"订单不能重复关联FromOrderId");
}
}
activityOrder.setAuditRemark("");
}else {
if (null != activityOrder.getFromOrderId()) {
if (null != activityOrder.getFromOrderId() && activityOrder.getFromOrderId() > 0) {
WxVtwoActivityOrder fromOrderQuery = new WxVtwoActivityOrder();
fromOrderQuery.updateTenantInfo(tenantEntity);
fromOrderQuery.setFromOrderId(activityOrder.getFromOrderId());
WxVtwoActivityOrder frecord = wxVtwoActivityOrderService.getlimitOne(activityOrder);
WxVtwoActivityOrder frecord = wxVtwoActivityOrderService.getlimitOne(fromOrderQuery);
if (null != frecord) {
throw new MallinkException(Result.ERROR,"订单不能重复关联FromOrderId");
}


+ 12
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOfflineConfigServiceImpl.java Parādīt failu

@@ -2,8 +2,10 @@ package com.iformall.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.iformall.common.IdWorker;
import com.iformall.common.Result;
import com.iformall.domain.po.*;
import com.iformall.enums.EnumOfflineActivityRecordStatus;
import com.iformall.exception.MallinkException;
import com.iformall.mapper.WxLegionActivityOrderMapper;
import com.iformall.mapper.WxOfflineActivityMapper;
import com.iformall.mapper.WxOfflineActivityRecordMapper;
@@ -156,6 +158,16 @@ public class WxLegionActivityOfflineConfigServiceImpl implements WxLegionActivit

@Override
public void syncOfflineActivityOrder(WxLegionActivityUser user, WxLegionActivityOrder legionActivityOrder, Map<Long, String> legionConfigMap) {
WxVtwoActivityOrder fromOrderQuery = new WxVtwoActivityOrder();
fromOrderQuery.updateTenantInfo(legionActivityOrder);
fromOrderQuery.setFromOrderId(legionActivityOrder.getId());
WxVtwoActivityOrder frecord = wxVtwoActivityOrderService.getlimitOne(fromOrderQuery);
if (null != frecord) {
throw new MallinkException(Result.ERROR,"订单不能重复关联FromOrderId");
}
WxVtwoActivityOrder order = new WxVtwoActivityOrder();
order.updateTenantInfo(legionActivityOrder);
order.setFromUserId(user.getId());


Notiek ielāde…
Atcelt
Saglabāt