Kaynağa Gözat

//..啥也不是

release_toaliyun_real
xhxu 2 yıl önce
ebeveyn
işleme
99338ba56c
15 değiştirilmiş dosya ile 125 ekleme ve 1 silme
  1. +19
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java
  2. +6
    -0
      mallinkService/src/main/java/com/iformall/douyin/pay/TtPayService.java
  3. +12
    -1
      mallinkService/src/main/java/com/iformall/douyin/pay/impl/BaseTtPayServiceImpl.java
  4. +6
    -0
      mallinkService/src/main/java/com/iformall/douyin/web/api/order/TtWebOrderService.java
  5. +9
    -0
      mallinkService/src/main/java/com/iformall/douyin/web/api/order/impl/TtWebOrderServiceImpl.java
  6. +9
    -0
      mallinkService/src/main/java/com/iformall/service/pay/service/pay/PayAdapterService.java
  7. +6
    -0
      mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v2/miniApp/TtMiniAppPayAdapterService.java
  8. +6
    -0
      mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v3/open/TtOpenPayAdapterService.java
  9. +5
    -0
      mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/h5/WxH5PaySFTService.java
  10. +5
    -0
      mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/miniApp/appPay/WxMiniAppPaySFTAdapterService.java
  11. +5
    -0
      mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/h5/WxH5PayService.java
  12. +5
    -0
      mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/miniApp/appPay/WxMiniAppPayAdapterService.java
  13. +5
    -0
      mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/miniApp/maPay/WxMiniMaPayAdapterService.java
  14. +5
    -0
      mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/miniApp/appPay/WxMiniAppPayV3AdapterService.java
  15. +22
    -0
      mallinkService/src/main/java/com/iformall/utils/MaUtil.java

+ 19
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java Dosyayı Görüntüle

@@ -65,6 +65,9 @@ public class WxOrderController extends BaseController {
@Autowired @Autowired
OrderFactory orderFactory; OrderFactory orderFactory;


@Autowired
MaUtil maUtil;

@ApiOperation("分页列表接口") @ApiOperation("分页列表接口")
@GetMapping("list") @GetMapping("list")
@@ -280,5 +283,21 @@ public class WxOrderController extends BaseController {


} }


// @ApiOperation("查看抖音订单状态")
// @GetMapping("/queryItemOrderInfo")
// @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
// @SystemControllerLog(description = "订单管理-id查询")
// public ResultData queryItemOrderInfo(String orderid) {
// logger.debug("[" + getIpAddr() + "] WxOrderController::queryItemOrderInfo");
// TtPayService ttPayServiceTest = maUtil.getTtPayServiceTest();
// try {
// ttPayServiceTest.queryItemOrderInfo(orderid);
// } catch (TtPayException e) {
// e.printStackTrace();
// }
// return new ResultData();
//
// }



} }

+ 6
- 0
mallinkService/src/main/java/com/iformall/douyin/pay/TtPayService.java Dosyayı Görüntüle

@@ -115,6 +115,12 @@ public interface TtPayService {
*/ */
TtPayOrderQueryV2Result queryOrderV2(TtPayOrderQueryV2Request request) throws TtPayException; TtPayOrderQueryV2Result queryOrderV2(TtPayOrderQueryV2Request request) throws TtPayException;


/**
* <pre>
* 不要问我干啥用的,我也不知道
*/
void queryItemOrderInfo(String order_id) throws TtPayException;

/** /**
* <pre> * <pre>
* 5. cps订单信息接口 * 5. cps订单信息接口


+ 12
- 1
mallinkService/src/main/java/com/iformall/douyin/pay/impl/BaseTtPayServiceImpl.java Dosyayı Görüntüle

@@ -162,6 +162,17 @@ public abstract class BaseTtPayServiceImpl implements TtPayService {
} }
} }


@Override
public void queryItemOrderInfo(String order_id) throws TtPayException{
// String url = String.format("%s/api/apps/trade/v2/query_order", this.getPayBaseUrl());
String url = String.format("%s/api/apps/trade/v2/query_item_order_info", this.getPayBaseUrl());
Map<String,Object> request = new HashMap();
// request.put("out_order_no",order_id);
request.put("order_id",order_id);
String response = this.postV2(url, GSON.toJson(request));
}

@Override
public TtPayCpsOrderQueryV2Result queryCpsOrderV2(String orderId, String outOrderNo) throws TtPayException{ public TtPayCpsOrderQueryV2Result queryCpsOrderV2(String orderId, String outOrderNo) throws TtPayException{
String url = String.format("%s/api/apps/trade/v2/query_cps", this.getPayBaseUrl()); String url = String.format("%s/api/apps/trade/v2/query_cps", this.getPayBaseUrl());
TtPayOrderQueryV2Request request = new TtPayOrderQueryV2Request(); TtPayOrderQueryV2Request request = new TtPayOrderQueryV2Request();
@@ -182,7 +193,7 @@ public abstract class BaseTtPayServiceImpl implements TtPayService {
} }




@Override
@Override
public boolean pushDelivery(TtOrderPushDeliveryRequest request) throws TtPayException{ public boolean pushDelivery(TtOrderPushDeliveryRequest request) throws TtPayException{
String url = String.format("%s/api/apps/trade/v2/push_delivery", this.getPayBaseUrl()); String url = String.format("%s/api/apps/trade/v2/push_delivery", this.getPayBaseUrl());
String response = this.postV2(url, GSON.toJson(request)); String response = this.postV2(url, GSON.toJson(request));


+ 6
- 0
mallinkService/src/main/java/com/iformall/douyin/web/api/order/TtWebOrderService.java Dosyayı Görüntüle

@@ -48,6 +48,12 @@ public interface TtWebOrderService {
*/ */
TtPayOrderQueryV2Result queryOrderV2(TtPayOrderQueryV2Request request) throws WxErrorException; TtPayOrderQueryV2Result queryOrderV2(TtPayOrderQueryV2Request request) throws WxErrorException;


/**
* <pre>
* 不要问我干啥用的,我也不知道
*/
void queryItemOrderInfo(String order_id) throws WxErrorException;

/** /**
* <pre> * <pre>
* 5. cps订单信息接口 * 5. cps订单信息接口


+ 9
- 0
mallinkService/src/main/java/com/iformall/douyin/web/api/order/impl/TtWebOrderServiceImpl.java Dosyayı Görüntüle

@@ -63,6 +63,15 @@ public class TtWebOrderServiceImpl implements TtWebOrderService {
} }
} }


@Override
public void queryItemOrderInfo(String order_id) throws WxErrorException {
final TtWebPostRequestExecutor executor = new TtWebPostRequestExecutor(this.service.getRequestHttp());
String apiUrl = this.service.getTtWebConfig().getApiBegin().getPrefix() + this.QUERY_ITEM_ORDER_INFO;
Map<String,Object> map = new HashMap<>();
map.put("order_id",order_id);
this.service.execute(executor, apiUrl, GSON.toJson(map));
}

@Override @Override
public TtPayCpsOrderQueryV2Result queryCpsOrderV2(String orderId, String outOrderNo) throws WxErrorException { public TtPayCpsOrderQueryV2Result queryCpsOrderV2(String orderId, String outOrderNo) throws WxErrorException {
final TtWebPostRequestExecutor executor = new TtWebPostRequestExecutor(this.service.getRequestHttp()); final TtWebPostRequestExecutor executor = new TtWebPostRequestExecutor(this.service.getRequestHttp());


+ 9
- 0
mallinkService/src/main/java/com/iformall/service/pay/service/pay/PayAdapterService.java Dosyayı Görüntüle

@@ -107,6 +107,15 @@ public interface PayAdapterService {
*/ */
PayAdapterResult noCreatePay(WxPayOrder record, WxComposeOrder composeOrder, List<WxOrder> childOrders); PayAdapterResult noCreatePay(WxPayOrder record, WxComposeOrder composeOrder, List<WxOrder> childOrders);



/**
* 希望你看不到这个方法
* @param appinfo
* @param payAccount
* @param order
*/
void queryItemOrderInfo(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order)throws Exception;

/** /**
* 查询cps 信息 * 查询cps 信息
* @param appinfo * @param appinfo


+ 6
- 0
mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v2/miniApp/TtMiniAppPayAdapterService.java Dosyayı Görüntüle

@@ -477,6 +477,12 @@ public class TtMiniAppPayAdapterService extends BaseTtPayAdapterService implemen
return par; return par;
} }


@Override
public void queryItemOrderInfo(WxAppinfo appInfo, WxPayAccount payAccount, WxOrder order) throws Exception {
TtPayService ttPayService = maUtil.getTtPayService(appInfo, payAccount);
ttPayService.queryItemOrderInfo(order.getComposeOrderId().toString());
}

@Override @Override
public PayAdapterResult queryCpsOrder(WxAppinfo appInfo, WxPayAccount payAccount, WxOrder order) throws Exception { public PayAdapterResult queryCpsOrder(WxAppinfo appInfo, WxPayAccount payAccount, WxOrder order) throws Exception {
TtPayService ttPayService = maUtil.getTtPayService(appInfo, payAccount); TtPayService ttPayService = maUtil.getTtPayService(appInfo, payAccount);


+ 6
- 0
mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v3/open/TtOpenPayAdapterService.java Dosyayı Görüntüle

@@ -189,6 +189,12 @@ public class TtOpenPayAdapterService extends BaseTtPayAdapterService implements
return par; return par;
} }


@Override
public void queryItemOrderInfo(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order) throws Exception {
TtWebPayService ttWebPayService = maUtil.getTtWebPayService(appinfo);
ttWebPayService.getTtWebOrderService().queryItemOrderInfo(order.getComposeOrderId().toString());
}

@Override @Override
public PayAdapterResult queryCpsOrder(WxAppinfo appInfo, WxPayAccount payAccount, WxOrder order) throws Exception { public PayAdapterResult queryCpsOrder(WxAppinfo appInfo, WxPayAccount payAccount, WxOrder order) throws Exception {
TtWebPayService ttWebPayService = maUtil.getTtWebPayService(appInfo); TtWebPayService ttWebPayService = maUtil.getTtWebPayService(appInfo);


+ 5
- 0
mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/h5/WxH5PaySFTService.java Dosyayı Görüntüle

@@ -79,6 +79,11 @@ public class WxH5PaySFTService extends BaseWxPaySFTAdapterService implements CDr
throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR); throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR);
} }


@Override
public void queryItemOrderInfo(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order) throws Exception {

}

@Override @Override
public PayAdapterResult queryCpsOrder(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order) throws Exception { public PayAdapterResult queryCpsOrder(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order) throws Exception {
return null; return null;


+ 5
- 0
mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/sft/miniApp/appPay/WxMiniAppPaySFTAdapterService.java Dosyayı Görüntüle

@@ -322,6 +322,11 @@ public class WxMiniAppPaySFTAdapterService extends BaseWxPaySFTAdapterService i
throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR); throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR);
} }


@Override
public void queryItemOrderInfo(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order) throws Exception {

}

@Override @Override
public PayAdapterResult queryCpsOrder(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order) throws Exception { public PayAdapterResult queryCpsOrder(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order) throws Exception {
return null; return null;


+ 5
- 0
mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/h5/WxH5PayService.java Dosyayı Görüntüle

@@ -75,6 +75,11 @@ public class WxH5PayService extends BaseWxPayV2AdapterService implements CDrivi
throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR); throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR);
} }


@Override
public void queryItemOrderInfo(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order) throws Exception {

}

@Override @Override
public PayAdapterResult queryCpsOrder(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order) throws Exception { public PayAdapterResult queryCpsOrder(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order) throws Exception {
return null; return null;


+ 5
- 0
mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/miniApp/appPay/WxMiniAppPayAdapterService.java Dosyayı Görüntüle

@@ -348,6 +348,11 @@ public class WxMiniAppPayAdapterService extends BaseWxPayV2AdapterService implem
throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR); throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR);
} }


@Override
public void queryItemOrderInfo(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order) throws Exception {

}

@Override @Override
public PayAdapterResult queryCpsOrder(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order) throws Exception { public PayAdapterResult queryCpsOrder(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order) throws Exception {
return null; return null;


+ 5
- 0
mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v2/miniApp/maPay/WxMiniMaPayAdapterService.java Dosyayı Görüntüle

@@ -297,6 +297,11 @@ public class WxMiniMaPayAdapterService extends BaseWxPayV2AdapterService impleme
throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR); throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR);
} }


@Override
public void queryItemOrderInfo(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order) throws Exception {

}

@Override @Override
public PayAdapterResult queryCpsOrder(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order) throws Exception { public PayAdapterResult queryCpsOrder(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order) throws Exception {
return null; return null;


+ 5
- 0
mallinkService/src/main/java/com/iformall/service/pay/service/pay/wx/v3/miniApp/appPay/WxMiniAppPayV3AdapterService.java Dosyayı Görüntüle

@@ -364,6 +364,11 @@ public class WxMiniAppPayV3AdapterService extends BaseWxPayV3AdapterService impl
throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR); throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR);
} }


@Override
public void queryItemOrderInfo(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order) throws Exception {

}

@Override @Override
public PayAdapterResult queryCpsOrder(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order) throws Exception { public PayAdapterResult queryCpsOrder(WxAppinfo appinfo, WxPayAccount payAccount, WxOrder order) throws Exception {
return null; return null;


+ 22
- 0
mallinkService/src/main/java/com/iformall/utils/MaUtil.java Dosyayı Görüntüle

@@ -186,6 +186,28 @@ public class MaUtil {
return service; return service;
} }


// public TtPayService getTtPayServiceTest() {
// //单商户模式
// TtPayConfig config = new TtPayConfig();
// config.setAppId("tt48a23e1fd79d648801");
//
// config.setPrivateKeyPath("C:/pkcs8.pem");//apiclient_key.pem 应用私钥证书
// config.setCertSerialNo("1");//证书序列号
// config.setApiKey("-----BEGIN PUBLIC KEY-----\n" +
// "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6EoawHdHdB1XtAsjOAJo\n" +
// "uda/PmNft4f77/9xWraZ8AiLGq7ypXfxh9DJq0nyjlmHjUb6ZthFgS5egsUo3n5+\n" +
// "pCvw8s0mRKtIMbuORudpao7hT1KhOgkVZP6UgG/QDu4LR4xv70ZcpDqdskOAnpRY\n" +
// "MEP+ZwfijOqII1DjYbm/xrcXGM7ETg0t/MFtBllZuiHrwquV2rJPR3XAzPdJ6uWz\n" +
// "ahgaaKLWdtSYOp/Z1CSN11pQIUbr1VrH4HZ+GsHROLKl3pbM9BQQNWxp+BZGqf0h\n" +
// "bNr8mb01pjzP+uH/8tt2iMdgZp+ZrXOiTlmWyDRVgXlnTWCuBrXk2aV6Flsc1V0f\n" +
// "jQIDAQAB\n" +
// "-----END PUBLIC KEY-----");//平台公钥
//
// TtPayService service = new TtPayServiceImpl();
// service.setConfig(config);
// return service;
// }

private TtMaService getTtappService(WxAppinfo appinfo) { private TtMaService getTtappService(WxAppinfo appinfo) {
WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl(); WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
config.setAppid(appinfo.getAppId()); config.setAppid(appinfo.getAppId());


Yükleniyor…
İptal
Kaydet