feats

src/main/java/com/yunzhi/niucai/alipay/AlipayFactory.java

@@ -2,14 +2,11 @@ package com.yunzhi.niucai.alipay;
 
 import com.alipay.api.AlipayClient;
 import com.alipay.api.DefaultAlipayClient;
-import com.yunzhi.niucai.alipay.vo.ITokenResolve;
 import com.yunzhi.niucai.entity.TaAlipay;
 import com.yunzhi.niucai.service.ITaAlipayService;
 import com.yunzhi.niucai.service.ITaShopAppService;
-import com.yunzhi.niucai.service.impl.TaShopAppServiceImpl;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;

src/main/java/com/yunzhi/niucai/alipay/vo/ITokenResolve.java → src/main/java/com/yunzhi/niucai/alipay/ITokenResolve.java

@@ -1,4 +1,4 @@
-package com.yunzhi.niucai.alipay.vo;
+package com.yunzhi.niucai.alipay;
 
 public interface ITokenResolve {
 

src/main/java/com/yunzhi/niucai/alipay/PayService.java

@@ -8,7 +8,6 @@ import com.alipay.api.request.AlipayOpenAuthTokenAppRequest;
 import com.alipay.api.request.AlipayTradeAppPayRequest;
 import com.alipay.api.response.AlipayOpenAuthTokenAppResponse;
 import com.alipay.api.response.AlipayTradeAppPayResponse;
-import com.yunzhi.niucai.alipay.vo.ITokenResolve;
 import com.yunzhi.niucai.alipay.vo.PayParam;
 import lombok.extern.slf4j.Slf4j;
 

src/main/java/com/yunzhi/niucai/service/impl/TaAlipayServiceImpl.java

@@ -61,7 +61,7 @@ public class TaAlipayServiceImpl extends ServiceImpl<TaAlipayMapper, TaAlipay> i
     public ResponseBean orderPaying(TaOrder taOrder, TaShopApp taShopApp) throws AlipayApiException {
         PayService payService = alipayFactory.getService(taOrder.getShopId());
 
-        String outTradeNo = "ALI" + System.currentTimeMillis() + randomString(5);
+        String outTradeNo = taOrder.getOrderId() + "-" + randomString(3);
         String subject = "支付宝支付";
         String totalAmount = String.format("%.2f", (float) taOrder.getCharge() / 100);
         PayParam payParam = new PayParam()

src/main/java/com/yunzhi/niucai/service/impl/TaShopAppServiceImpl.java

@@ -1,7 +1,7 @@
 package com.yunzhi.niucai.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.yunzhi.niucai.alipay.vo.ITokenResolve;
+import com.yunzhi.niucai.alipay.ITokenResolve;
 import com.yunzhi.niucai.common.StringUtils;
 import com.yunzhi.niucai.entity.TaShopApp;
 import com.yunzhi.niucai.mapper.TaShopAppMapper;