Browse Source

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

release_toaliyun_real
winter 1 year ago
parent
commit
fdd7ac1fb1
3 changed files with 20 additions and 6 deletions
  1. +5
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java
  2. +11
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityRecordServiceImpl.java
  3. +4
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityServiceImpl.java

+ 5
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java View File

@@ -97,7 +97,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
handlerRecordQuery(wxOfflineActivityRecord);
WxOfflineActivityRecord limitOne = wxOfflineActivityRecordMapper.selectLimitOne(wxOfflineActivityRecord);
Map<String, Object> result = new HashMap<>();
Integer audting = 0, audi_success = 0, audt_fail = 0;
Integer audting = 0, audi_success = 0, audt_fail = 0,invalid = 0;
BigDecimal sum_success = BigDecimal.ZERO, sum_fail = BigDecimal.ZERO;
if (limitOne == null) {
result.put("cus_name","查无此人");
@@ -116,6 +116,8 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
sum_success = statistics.getSumMoney();
} else if (EnumOfflineActivityRecordStatus.AUDT_FAIL.getCode().equals(statistics.getAuditStatus())) {
audt_fail = statistics.getCount();
} else if (EnumOfflineActivityRecordStatus.INVALID.getCode().equals(statistics.getAuditStatus())) {
invalid = statistics.getCount();
}
}
}
@@ -124,7 +126,8 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
result.put("audi_success",audi_success);
result.put("sum_success",sum_success);
result.put("audt_fail",audt_fail);
result.put("sum_count",audting+audi_success+audt_fail);
result.put("invalid",invalid);
result.put("sum_count",audting+audi_success+audt_fail+invalid);
return result;
}



+ 11
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityRecordServiceImpl.java View File

@@ -4,11 +4,13 @@ import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.iformall.common.IdWorker;
import com.iformall.common.Result;
import com.iformall.domain.po.*;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.OfflineActivityRecordStatistics;
import com.iformall.enums.EnumOfflineActivityRecordStatus;
import com.iformall.enums.EnumYesOrNo;
import com.iformall.exception.MallinkException;
import com.iformall.mapper.WxMerchantMapper;
import com.iformall.mapper.WxOfflineActivityGrantAwardMapper;
import com.iformall.mapper.WxOfflineActivityRecordGrantMapper;
@@ -166,6 +168,10 @@ public class WxOfflineActivityRecordServiceImpl implements WxOfflineActivityReco
wxOfflineActivityRecordMapper.insert(wxOfflineActivityRecord);
}
else{
WxOfflineActivityRecord record = wxOfflineActivityRecordMapper.selectById(wxOfflineActivityRecord.getId());
if(!EnumOfflineActivityRecordStatus.AUDT_FAIL.getCode().equals(record.getAuditStatus())){
throw new MallinkException(Result.ERROR,"订单状态不允许修改");
}
wxOfflineActivityRecord.setAuditRemark("");
wxOfflineActivityRecord.setAuditStatus(EnumOfflineActivityRecordStatus.AUDTING.getCode());
wxOfflineActivityRecord.setUpdateDate(now);
@@ -192,7 +198,7 @@ public class WxOfflineActivityRecordServiceImpl implements WxOfflineActivityReco
public Map<String, Integer> getStatistics(WxOfflineActivityRecord wxOfflineActivityRecord) {
List<OfflineActivityRecordStatistics> auditStatusStatistics = wxOfflineActivityRecordMapper.auditStatusStatistics(wxOfflineActivityRecord);
Map<String, Integer> result = new HashMap<>();
Integer audting = 0, audi_success = 0, audt_fail = 0;
Integer audting = 0, audi_success = 0, audt_fail = 0, invalid = 0;
for(OfflineActivityRecordStatistics statistics : auditStatusStatistics){
if(EnumOfflineActivityRecordStatus.AUDTING.getCode().equals(statistics.getAuditStatus())){
audting = statistics.getCount();
@@ -200,12 +206,15 @@ public class WxOfflineActivityRecordServiceImpl implements WxOfflineActivityReco
audi_success = statistics.getCount();
} else if (EnumOfflineActivityRecordStatus.AUDT_FAIL.getCode().equals(statistics.getAuditStatus())) {
audt_fail = statistics.getCount();
} else if (EnumOfflineActivityRecordStatus.INVALID.getCode().equals(statistics.getAuditStatus())) {
invalid = statistics.getCount();
}
}
result.put("audting",audting);
result.put("audi_success",audi_success);
result.put("audt_fail",audt_fail);
result.put("sum_count",audting+audi_success+audt_fail);
result.put("invalid",invalid);
result.put("sum_count",audting+audi_success+audt_fail+invalid);
return result;
}



+ 4
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityServiceImpl.java View File

@@ -89,7 +89,7 @@ public class WxOfflineActivityServiceImpl implements WxOfflineActivityService{
wxOfflineActivityRecord.setNotMerchantIdList(merchantIds);
}
List<OfflineActivityRecordStatistics> auditStatusStatistics = wxOfflineActivityRecordMapper.auditStatusStatistics(wxOfflineActivityRecord);
Integer audting = 0, audi_success = 0, audt_fail = 0;
Integer audting = 0, audi_success = 0, audt_fail = 0, invalid = 0;
for(OfflineActivityRecordStatistics statistics : auditStatusStatistics){
if(EnumOfflineActivityRecordStatus.AUDTING.getCode().equals(statistics.getAuditStatus())){
audting = statistics.getCount();
@@ -97,9 +97,11 @@ public class WxOfflineActivityServiceImpl implements WxOfflineActivityService{
audi_success = statistics.getCount();
} else if (EnumOfflineActivityRecordStatus.AUDT_FAIL.getCode().equals(statistics.getAuditStatus())) {
audt_fail = statistics.getCount();
}else if (EnumOfflineActivityRecordStatus.INVALID.getCode().equals(statistics.getAuditStatus())) {
invalid = statistics.getCount();
}
}
activity.setRecordCount(audting+audi_success+audt_fail);
activity.setRecordCount(audting+audi_success+audt_fail+invalid);
activity.setWaitRecordCount(audting);
activity.setSuccessRecordCount(audi_success);



Loading…
Cancel
Save