|
@@ -227,9 +227,9 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
|
|
incrementOrderEntity.setMonthQy(param.getMonthQy());
|
|
incrementOrderEntity.setMonthQy(param.getMonthQy());
|
|
incrementOrderEntity.setTimeZoneOff(param.getTimeZoneOff());
|
|
incrementOrderEntity.setTimeZoneOff(param.getTimeZoneOff());
|
|
incrementOrderEntity.setAutoPay(param.getAutoPay());
|
|
incrementOrderEntity.setAutoPay(param.getAutoPay());
|
|
- incrementOrderEntity.setOriginUrl(param.getOrigin());
|
|
|
|
|
|
+ incrementOrderEntity.setAgentKey(param.getAgentKey());
|
|
if(param.getAutoPay() != null && param.getAutoPay()==1){
|
|
if(param.getAutoPay() != null && param.getAutoPay()==1){
|
|
- incrementAutoOrderService.addOrder(user.getId(),incrementType.getId(),param.getIncrementId(),incrementOrderEntity.getOrderSn(),param.getOrigin());
|
|
|
|
|
|
+ incrementAutoOrderService.addOrder(user.getId(),incrementType.getId(),param.getIncrementId(),incrementOrderEntity.getOrderSn(),param.getAgentKey());
|
|
return incrementOrderEntity;
|
|
return incrementOrderEntity;
|
|
}
|
|
}
|
|
this.save(incrementOrderEntity);
|
|
this.save(incrementOrderEntity);
|
|
@@ -291,7 +291,7 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
|
|
incrementOrder.setAutoPay(1);
|
|
incrementOrder.setAutoPay(1);
|
|
incrementOrder.setAutoOrderId(incrementAutoOrder.getId());
|
|
incrementOrder.setAutoOrderId(incrementAutoOrder.getId());
|
|
incrementOrder.setTimeZoneOff(-480);
|
|
incrementOrder.setTimeZoneOff(-480);
|
|
- incrementOrder.setOriginUrl(incrementAutoOrder.getOriginUrl());
|
|
|
|
|
|
+ incrementOrder.setAgentKey(incrementAutoOrder.getAgentKey());
|
|
IncrementType incrementType = incrementTypeService.getById(incrementAutoOrder.getIncrementTypeId());
|
|
IncrementType incrementType = incrementTypeService.getById(incrementAutoOrder.getIncrementTypeId());
|
|
if(incrementType != null && incrementType.getValidTimeType() == 0){
|
|
if(incrementType != null && incrementType.getValidTimeType() == 0){
|
|
incrementOrder.setMemberLevels("PR");
|
|
incrementOrder.setMemberLevels("PR");
|