商城代码，分支冲突

fs-service/src/main/java/com/fs/company/service/ICompanyRechargeOrderService.java

@@ -1,16 +0,0 @@
-package com.fs.company.service;
-
-import com.fs.company.domain.CompanyRechargeOrder;
-
-import java.util.List;
-
-public interface ICompanyRechargeOrderService {
-
-    List<CompanyRechargeOrder> queryOverdueOrder();
-
-    void autoClosedOrder();
-
-    CompanyRechargeOrder createOrder(CompanyRechargeOrder order) throws Exception;
-
-    CompanyRechargeOrder queryOrder(String orderNo);
-}

fs-service/src/main/java/com/fs/company/service/impl/CompanyRechargeOrderServiceImpl.java

@@ -5,11 +5,9 @@ import com.fs.common.utils.IpUtil;
 import com.fs.company.constant.PaymentStatus;
 import com.fs.company.domain.CompanyRechargeOrder;
 import com.fs.company.mapper.CompanyRechargeOrderMapper;
-import com.fs.company.service.ICompanyRechargeOrderService;
 import com.fs.company.util.OrderUtils;
 import com.fs.company.service.CompanyRechargeOrderService;
 import com.fs.core.config.WxPayProperties;
-import com.fs.wx.utils.OrderUtils;
 import com.github.binarywang.wxpay.bean.order.WxPayNativeOrderResult;
 import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
 import com.github.binarywang.wxpay.config.WxPayConfig;

fs-service/src/main/java/com/fs/core/config/WxPayProperties.java

@@ -75,7 +75,6 @@ public class WxPayProperties {
   public String getSubAppId() {
     return subAppId;
   }
-  private String privateKeyPath;
 
   public void setSubAppId(String subAppId) {
     this.subAppId = subAppId;

fs-service/src/main/java/com/fs/task/OrderTask.java

@@ -1,13 +1,13 @@
 package com.fs.task;
 
-import com.fs.company.service.ICompanyRechargeOrderService;
+import com.fs.company.service.CompanyRechargeOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 @Component("orderTask")
 public class OrderTask {
     @Autowired
-    private ICompanyRechargeOrderService companyRechargeOrderService;
+    private CompanyRechargeOrderService companyRechargeOrderService;
 
 
     /**