'提交代码'

dev-discount
胡锐 3 years ago
parent 7c50ee7e15
commit 0fb3e26e1b
  1. 13
      hai-cweb/src/main/java/com/cweb/controller/HighTestController.java

@ -9,15 +9,11 @@ import com.hai.common.exception.SysCode;
import com.hai.common.pay.util.XmlUtil; import com.hai.common.pay.util.XmlUtil;
import com.hai.common.pay.util.sdk.WXPayConstants; import com.hai.common.pay.util.sdk.WXPayConstants;
import com.hai.common.utils.*; import com.hai.common.utils.*;
<<<<<<< HEAD
import com.hai.config.*;
=======
import com.hai.config.CommonSysConst; import com.hai.config.CommonSysConst;
import com.hai.config.HuiLianTongConfig; import com.hai.config.HuiLianTongConfig;
import com.hai.config.QianZhuConfig; import com.hai.config.QianZhuConfig;
import com.hai.config.TuanYouConfig; import com.hai.config.TuanYouConfig;
import com.hai.dao.HighGasOrderPushMapper; import com.hai.dao.HighGasOrderPushMapper;
>>>>>>> pre
import com.hai.entity.*; import com.hai.entity.*;
import com.hai.model.HighMerchantModel; import com.hai.model.HighMerchantModel;
import com.hai.model.HighMerchantStoreModel; import com.hai.model.HighMerchantStoreModel;
@ -43,14 +39,10 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
<<<<<<< HEAD
import javax.net.ssl.SSLContext; import javax.net.ssl.SSLContext;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.security.KeyStore; import java.security.KeyStore;
=======
import java.math.BigDecimal;
>>>>>>> pre
import java.util.*; import java.util.*;
/** /**
@ -78,11 +70,10 @@ public class HighTestController {
private HighOrderService highOrderService; private HighOrderService highOrderService;
@Resource @Resource
<<<<<<< HEAD
private HighProfitSharingRecordService highProfitSharingRecordService; private HighProfitSharingRecordService highProfitSharingRecordService;
=======
@Resource
private HighGasOrderPushMapper highGasOrderPushMapper; private HighGasOrderPushMapper highGasOrderPushMapper;
>>>>>>> pre
@RequestMapping(value = "/initTYMerchantStore", method = RequestMethod.GET) @RequestMapping(value = "/initTYMerchantStore", method = RequestMethod.GET)
@ResponseBody @ResponseBody

Loading…
Cancel
Save