feat 0 支付工程

payment-base-app/src/main/java/com/base/springcloud/constant/PaymentConstant.java

@@ -4,6 +4,7 @@ public interface PaymentConstant {
 
 
 	String TOKEN_PREFIX = "prefix_user_token_";		// TOKEN前缀
+	String MECHANT_CERTIFICATE_SAVE_PATH = "merchant/paymentConfigure"; // 商户证书保存路径
 	String WAIT 	= "W";							// 等待付款
 	String SUCCESS 	= "S";							// 支付完成
 	String WX_SUCCESS = "SUCCESS";					// 微信支付成功状态

payment-base-app/src/main/java/com/base/springcloud/service/imp/MerchantServiceImp.java

@@ -5,26 +5,23 @@ import com.base.springcloud.bo.DepartBO;
 import com.base.springcloud.bo.MerchantConfigBO;
 import com.base.springcloud.bo.OrderBO;
 import com.base.springcloud.constant.ErrorConstant;
+import com.base.springcloud.constant.PaymentConstant;
 import com.base.springcloud.dao.MerchantConfigMapper;
 import com.base.springcloud.entity.MerchantConfig;
-import com.base.springcloud.handle.RBSQueueHandler;
 import com.base.springcloud.service.DepartService;
 import com.base.springcloud.service.MerchantService;
-import com.base.springcloud.util.FtpUtil;
 import com.base.springcloud.util.OssBootUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.*;
+import java.io.File;
-import java.nio.charset.StandardCharsets;
+import java.io.IOException;
-import java.nio.file.Files;
+import java.io.InputStream;
-import java.nio.file.Paths;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
@@ -75,7 +72,9 @@ public class MerchantServiceImp implements MerchantService {
 	 * @return
 	 */
 	private String uploadCertificate(MultipartFile certFile) {
-		return OssBootUtil.upload(certFile, "merchant/paymentConfigure");
+		String filePath = OssBootUtil.upload(certFile, PaymentConstant.MECHANT_CERTIFICATE_SAVE_PATH);
+		String temp[] = filePath.split("\\/");
+		return PaymentConstant.MECHANT_CERTIFICATE_SAVE_PATH + temp[temp.length - 1];
 	}
 
 	/**