|
|
|
@@ -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"); |
|
|
|
} |
|
|
|
|