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

fix bugger

Browse Source
This commit is contained in:
Carl 2021-12-28 15:10:44 +08:00
parent 7c44493aa3
commit 7416626cf3
5 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,8 +18,8 @@ public class CouponConfigService {
public String couponConfigGet(CouponConfigGetEntity couponConfigGetEntity) throws Exception{ public String couponConfigGet(CouponConfigGetEntity couponConfigGetEntity) throws Exception{
Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(couponConfigGetEntity); Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(couponConfigGetEntity);
MapRemoveNullUtil.removeNullEntry(paramMap); MapRemoveNullUtil.removeNullEntry(paramMap);
net.sf.json.JSONObject jsonObject = net.sf.json.JSONObject.fromObject(paramMap); // net.sf.json.JSONObject jsonObject = net.sf.json.JSONObject.fromObject(paramMap);
return SmartHttpUtil.httpPostRaw(url+"get",jsonObject.toString(),null,"utf-8"); return SmartHttpUtil.sendPostForm(url+"get",paramMap,null);
} }
public String couponConfigFindAll(CouponConfigFindAllEntity couponConfigFindAllEntity) throws Exception{ public String couponConfigFindAll(CouponConfigFindAllEntity couponConfigFindAllEntity) throws Exception{
@ -30,7 +30,7 @@ public class CouponConfigService {
paramMap.put("page",StringUtil.toString(couponConfigFindAllEntity.getPage()).equals("0")?null:StringUtil.toString(couponConfigFindAllEntity.getPage())); paramMap.put("page",StringUtil.toString(couponConfigFindAllEntity.getPage()).equals("0")?null:StringUtil.toString(couponConfigFindAllEntity.getPage()));
MapRemoveNullUtil.removeNullEntry(paramMap); MapRemoveNullUtil.removeNullEntry(paramMap);
net.sf.json.JSONObject jsonObject = net.sf.json.JSONObject.fromObject(paramMap); net.sf.json.JSONObject jsonObject = net.sf.json.JSONObject.fromObject(paramMap);
return SmartHttpUtil.httpPostRaw(url+"findAll",jsonObject.toString(),null,"utf-8"); return SmartHttpUtil.httpPostRaw(url+"getAll",jsonObject.toString(),null,"utf-8");
} }
} }

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

@ -151,7 +151,7 @@ public class TransitionController {
long startTime = System.currentTimeMillis(); long startTime = System.currentTimeMillis();
switch (type) switch (type)
{ {
case "findAll": case "getAll":
result = couponConfigService.couponConfigFindAll(objectMapper.convertValue(object, CouponConfigFindAllEntity.class)); result = couponConfigService.couponConfigFindAll(objectMapper.convertValue(object, CouponConfigFindAllEntity.class));
break; break;
case "get": case "get":

2
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java
View File

@ -97,8 +97,6 @@ public class OrderService {
} }
if(ordersDao.cancelOrder(orderNo) == 1){ if(ordersDao.cancelOrder(orderNo) == 1){
AddOrSaveEntity addOrSaveEntity = new AddOrSaveEntity(); AddOrSaveEntity addOrSaveEntity = new AddOrSaveEntity();
addOrSaveEntity.setChannelId("15");
addOrSaveEntity.setSecret("H5@2021");
addOrSaveEntity.setOrderNumber(orderNo); addOrSaveEntity.setOrderNumber(orderNo);
addOrSaveEntity.setPhoneNumber(ordersEntity.getPhoneNumber()); addOrSaveEntity.setPhoneNumber(ordersEntity.getPhoneNumber());
addOrSaveEntity.setStatus("3"); addOrSaveEntity.setStatus("3");

26
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/orderMaster/AddOrSaveEntity.java
View File

@ -1,37 +1,37 @@
package net.lab1024.smartadmin.module.system.royalcanin.orderMaster; package net.lab1024.smartadmin.module.system.royalcanin.orderMaster;
import lombok.Data; import lombok.Data;
import net.lab1024.smartadmin.util.SmartDateUtil;
import net.sf.json.JSONArray; import net.sf.json.JSONArray;
import java.util.Date;
import java.util.List; import java.util.List;
@Data @Data
public class AddOrSaveEntity { public class AddOrSaveEntity {
private String channelId;
private String secret;
private String orderNumber; private String orderNumber ="null";
private String phoneNumber; private String phoneNumber ="null";
private String salesAmount; private String salesAmount ="null";
private String status; private String status ="null";
private String paymentResult; private String paymentResult ="null";
private String paymentAmount; private String paymentAmount ="null";
private String orderDate; private String orderDate = SmartDateUtil.formatYMD(new Date());
private String paymentToken; private String paymentToken ="null";
private String deliveryType; private String deliveryType ="1";
private String orderDetailList; private String orderDetailList ="null";
private String orderCoupon; private String orderCoupon ="null";
} }

2
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/orderMaster/OrderDatilListEntity.java
View File

@ -19,7 +19,7 @@ public class OrderDatilListEntity {
private String logisticsNumber; private String logisticsNumber;
private String status; private String status = "0";
private String logisticsDate; private String logisticsDate;