From bb2c4903ce6cadeb402c292ca07cd32afefdb337 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Sat, 29 Jan 2022 19:25:33 +0800 Subject: [PATCH] debugger --- .../module/system/royalcanin/CouponConfigService.java | 3 ++- .../smartadmin/module/system/royalcanin/CouponService.java | 4 +++- .../module/system/royalcanin/MemberAccountService.java | 2 +- .../module/system/royalcanin/MemberAddressService.java | 2 +- .../smartadmin/module/system/royalcanin/MemberService.java | 2 +- .../module/system/royalcanin/good/OrderController.java | 6 ------ .../module/system/royalcanin/good/service/GoodService.java | 4 ++-- .../module/system/royalcanin/good/service/OrderService.java | 4 ++-- 8 files changed, 12 insertions(+), 15 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 85080b4e..fdd9b83a 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 @@ -13,7 +13,8 @@ import java.util.Map; @Service public class CouponConfigService { - private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/couponConfig/"; +// private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/couponConfig/"; + private String url = "http://crm.royalcanin.com.cn:8080/crm/couponConfig/"; public String couponConfigGet(CouponConfigGetEntity couponConfigGetEntity) throws Exception{ Map paramMap = MapRemoveNullUtil.setConditionMap(couponConfigGetEntity); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java index dd1a7a14..8ddbd7bd 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/CouponService.java @@ -12,7 +12,9 @@ import java.util.Map; @Service public class CouponService { - private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/coupon/"; +// private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/coupon/"; + + private String url = "http://crm.royalcanin.com.cn:8080/crm/coupon/"; public String couponCancel(CouponCancelEntity couponCancelEntity) throws Exception{ Map paramMap = MapRemoveNullUtil.setConditionMap(couponCancelEntity); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAccountService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAccountService.java index 0b388849..95699e18 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAccountService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAccountService.java @@ -16,7 +16,7 @@ import java.util.Map; @Service public class MemberAccountService { - private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/memberAccount/"; + private String url = "http://crm.royalcanin.com.cn:8080/crm/memberAccount/"; public String memberAccountChange(MemberAccountChangeEntity memberAccountChangeEntity){ memberAccountChangeEntity.setChannelId(15); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAddressService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAddressService.java index e8bf3682..d1eee1e4 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAddressService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberAddressService.java @@ -15,7 +15,7 @@ import java.util.Map; @Service public class MemberAddressService { - private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/memberAddress/"; + private String url = "http://crm.royalcanin.com.cn:8080/crm/memberAddress/"; public String membberAddressGetAll(MemberAddressGetAllEntity memberAddressGetAllEntity) throws Exception { diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java index 60772a28..6facd3a8 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java @@ -13,7 +13,7 @@ import java.util.Map; @Service public class MemberService { - private String url = "http://miniapp-test.royalcanin.com.cn:7080/crm/member/"; + private String url = "http://crm.royalcanin.com.cn:8080/crm/member/"; diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java index 3cafff56..87a90d6e 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java @@ -19,7 +19,6 @@ import net.lab1024.smartadmin.module.system.royalcanin.good.constant.OrderRespon import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrderAddress; import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrderEntity; import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrdersEntity; -import net.lab1024.smartadmin.module.system.royalcanin.good.model.ProductMasterQueryEntity; import net.lab1024.smartadmin.module.system.royalcanin.good.service.CartService; import net.lab1024.smartadmin.module.system.royalcanin.good.service.OrderService; import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.OrderDatilListEntity; @@ -28,18 +27,13 @@ import net.lab1024.smartadmin.module.system.wxpay.MyConfig; import net.lab1024.smartadmin.module.system.wxpay.WxpayService; import net.lab1024.smartadmin.module.system.wxpay.wxPayModel.WxPayEntity; import net.lab1024.smartadmin.util.GenerateSequenceUtil; -import net.lab1024.smartadmin.util.MapRemoveNullUtil; -import net.lab1024.smartadmin.util.SmartHttpUtil; import net.sf.json.JSONArray; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.utils.URLEncodedUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.net.URLEncoder; import java.util.*; @Api(tags = {SwaggerTagConst.Admin.MANAGER_MALL_API}) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java index 468d9734..239126b0 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java @@ -21,8 +21,8 @@ import java.util.concurrent.TimeUnit; @Service public class GoodService { - String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/"; -// String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020"; +// String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/"; + String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020/"; @Autowired private GoodsDao goodsDao; 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 46b34ef9..6280d4f3 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 @@ -46,8 +46,8 @@ public class OrderService { @Autowired private NotifyService notifyService; - String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/"; -// String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020"; +// String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/"; + String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020"; @Transactional public int generateOrder(OrdersEntity ordersEntity, JSONArray listJson) throws Exception {