xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-10-01 17:56:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!223 adding filter coupon logic

Browse Source 
Merge pull request !223 from Admin/sit-Carl-V3
This commit is contained in:
Admin 2022-03-14 07:04:33 +00:00 committed by Gitee
commit 48f272415f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java
View File

@ -5,10 +5,12 @@ import com.alibaba.fastjson.JSONObject;
import net.lab1024.smartadmin.common.heartbeat.StringUtil;
import net.lab1024.smartadmin.module.system.royalcanin.coupon.*;
import net.lab1024.smartadmin.util.MapRemoveNullUtil;
import net.lab1024.smartadmin.util.SmartDateUtil;
import net.lab1024.smartadmin.util.SmartHttpUtil;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.Map;
@Service
@ -41,11 +43,12 @@ public class CouponService {
public String couponGetAll(CouponGetAllEntity couponGetAllEntity) throws Exception{
String[] productCode = couponGetAllEntity.getProductCodes().split(",");
Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(couponGetAllEntity);
Date currentDate = SmartDateUtil.parseYMD(paramMap.get("useStartDate") == null ? "2099-01-01":paramMap.get("useStartDate"));
paramMap.remove("productCodes");
paramMap.put("status",StringUtil.toString(couponGetAllEntity.getStatus()).equals("0")?null:StringUtil.toString(couponGetAllEntity.getStatus()));
paramMap.put("page",StringUtil.toString(couponGetAllEntity.getPage()).equals("0")?null:StringUtil.toString(couponGetAllEntity.getPage()));
paramMap.put("rows",StringUtil.toString(couponGetAllEntity.getRows()).equals("0")?null:StringUtil.toString(couponGetAllEntity.getRows()));
paramMap.replace("usestartDate",paramMap.get("useStartDate"));
paramMap.put("usestartDate",paramMap.get("useStartDate"));
paramMap.remove("useStartDate");
MapRemoveNullUtil.removeNullEntry(paramMap);
String result = SmartHttpUtil.sendPostForm(url+"getAll",paramMap,null);
@ -56,9 +59,11 @@ public class CouponService {
for(int i = 0;i < jsonArray.size();i ++){
JSONObject jsonResult = (JSONObject)jsonArray.get(i);
if(jsonResult.getString("udf2") != null) {
if ("H5".equals(jsonResult.getString("udf2"))&&"".equals(productCode)) {
//&&compareDate.compareTo(currentDate)>=0
Date compareDate = SmartDateUtil.parseYMD(jsonResult.get("fValidFrom").toString());
if ("H5".equals(jsonResult.getString("udf2"))&&"".equals(productCode)&&compareDate.compareTo(currentDate)==-1) {
afterFilterArrary.add(jsonResult);
}else if ("H5".equals(jsonResult.getString("udf2"))&&!"".equals(productCode)){
}else if ("H5".equals(jsonResult.getString("udf2"))&&!"".equals(productCode)&&compareDate.compareTo(currentDate)==-1){
for(int g = 0 ;g<productCode.length;g++) {
if ((jsonResult.get("productCodes") != null ? jsonResult.get("productCodes").toString().indexOf(productCode[g]) : "".indexOf(productCode[g])) != -1 || jsonResult.get("productCodes") == null) {
afterFilterArrary.add(jsonResult);