From 7416626cf3a8c275123fc0ac92f1c24aa1b1c9b9 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Tue, 28 Dec 2021 15:10:44 +0800 Subject: [PATCH] fix bugger --- .../royalcanin/CouponConfigService.java | 6 ++--- .../royalcanin/TransitionController.java | 2 +- .../royalcanin/good/service/OrderService.java | 2 -- .../orderMaster/AddOrSaveEntity.java | 26 +++++++++---------- .../orderMaster/OrderDatilListEntity.java | 2 +- 5 files changed, 18 insertions(+), 20 deletions(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponConfigService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponConfigService.java index 7242398a..c025efa0 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponConfigService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponConfigService.java @@ -18,8 +18,8 @@ public class CouponConfigService { public String couponConfigGet(CouponConfigGetEntity couponConfigGetEntity) throws Exception{ Map paramMap = MapRemoveNullUtil.setConditionMap(couponConfigGetEntity); MapRemoveNullUtil.removeNullEntry(paramMap); - net.sf.json.JSONObject jsonObject = net.sf.json.JSONObject.fromObject(paramMap); - return SmartHttpUtil.httpPostRaw(url+"get",jsonObject.toString(),null,"utf-8"); +// net.sf.json.JSONObject jsonObject = net.sf.json.JSONObject.fromObject(paramMap); + return SmartHttpUtil.sendPostForm(url+"get",paramMap,null); } 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())); MapRemoveNullUtil.removeNullEntry(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"); } } diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java index 5fd544f2..9c736648 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java @@ -151,7 +151,7 @@ public class TransitionController { long startTime = System.currentTimeMillis(); switch (type) { - case "findAll": + case "getAll": result = couponConfigService.couponConfigFindAll(objectMapper.convertValue(object, CouponConfigFindAllEntity.class)); break; case "get": diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java index d68a8c0b..017bfdc7 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java @@ -97,8 +97,6 @@ public class OrderService { } if(ordersDao.cancelOrder(orderNo) == 1){ AddOrSaveEntity addOrSaveEntity = new AddOrSaveEntity(); - addOrSaveEntity.setChannelId("15"); - addOrSaveEntity.setSecret("H5@2021"); addOrSaveEntity.setOrderNumber(orderNo); addOrSaveEntity.setPhoneNumber(ordersEntity.getPhoneNumber()); addOrSaveEntity.setStatus("3"); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/orderMaster/AddOrSaveEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/orderMaster/AddOrSaveEntity.java index d6c29a91..e2343b02 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/orderMaster/AddOrSaveEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/orderMaster/AddOrSaveEntity.java @@ -1,37 +1,37 @@ package net.lab1024.smartadmin.module.system.royalcanin.orderMaster; import lombok.Data; +import net.lab1024.smartadmin.util.SmartDateUtil; import net.sf.json.JSONArray; +import java.util.Date; import java.util.List; @Data 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"; } diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/orderMaster/OrderDatilListEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/orderMaster/OrderDatilListEntity.java index 90c4d42b..602156e0 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/orderMaster/OrderDatilListEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/orderMaster/OrderDatilListEntity.java @@ -19,7 +19,7 @@ public class OrderDatilListEntity { private String logisticsNumber; - private String status; + private String status = "0"; private String logisticsDate;