This commit is contained in:
Carl 2022-01-29 19:25:33 +08:00
parent 0c5e6bc33a
commit bb2c4903ce
8 changed files with 12 additions and 15 deletions

View File

@ -13,7 +13,8 @@ import java.util.Map;
@Service @Service
public class CouponConfigService { 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{ public String couponConfigGet(CouponConfigGetEntity couponConfigGetEntity) throws Exception{
Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(couponConfigGetEntity); Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(couponConfigGetEntity);

View File

@ -12,7 +12,9 @@ import java.util.Map;
@Service @Service
public class CouponService { 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{ public String couponCancel(CouponCancelEntity couponCancelEntity) throws Exception{
Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(couponCancelEntity); Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(couponCancelEntity);

View File

@ -16,7 +16,7 @@ import java.util.Map;
@Service @Service
public class MemberAccountService { 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){ public String memberAccountChange(MemberAccountChangeEntity memberAccountChangeEntity){
memberAccountChangeEntity.setChannelId(15); memberAccountChangeEntity.setChannelId(15);

View File

@ -15,7 +15,7 @@ import java.util.Map;
@Service @Service
public class MemberAddressService { 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 { public String membberAddressGetAll(MemberAddressGetAllEntity memberAddressGetAllEntity) throws Exception {

View File

@ -13,7 +13,7 @@ import java.util.Map;
@Service @Service
public class MemberService { 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/";

View File

@ -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.OrderAddress;
import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrderEntity; 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.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.CartService;
import net.lab1024.smartadmin.module.system.royalcanin.good.service.OrderService; import net.lab1024.smartadmin.module.system.royalcanin.good.service.OrderService;
import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.OrderDatilListEntity; 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.WxpayService;
import net.lab1024.smartadmin.module.system.wxpay.wxPayModel.WxPayEntity; import net.lab1024.smartadmin.module.system.wxpay.wxPayModel.WxPayEntity;
import net.lab1024.smartadmin.util.GenerateSequenceUtil; import net.lab1024.smartadmin.util.GenerateSequenceUtil;
import net.lab1024.smartadmin.util.MapRemoveNullUtil;
import net.lab1024.smartadmin.util.SmartHttpUtil;
import net.sf.json.JSONArray; 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.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.net.URLEncoder;
import java.util.*; import java.util.*;
@Api(tags = {SwaggerTagConst.Admin.MANAGER_MALL_API}) @Api(tags = {SwaggerTagConst.Admin.MANAGER_MALL_API})

View File

@ -21,8 +21,8 @@ import java.util.concurrent.TimeUnit;
@Service @Service
public class GoodService { public class GoodService {
String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/"; // String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/";
// String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020"; String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020/";
@Autowired @Autowired
private GoodsDao goodsDao; private GoodsDao goodsDao;

View File

@ -46,8 +46,8 @@ public class OrderService {
@Autowired @Autowired
private NotifyService notifyService; private NotifyService notifyService;
String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/"; // String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/";
// String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020"; String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020";
@Transactional @Transactional
public int generateOrder(OrdersEntity ordersEntity, JSONArray listJson) throws Exception { public int generateOrder(OrdersEntity ordersEntity, JSONArray listJson) throws Exception {