|
|
@@ -35,6 +35,7 @@ import com.fs.hisStore.dto.FsStoreOrderComputeDTO;
|
|
|
import com.fs.hisStore.enums.OrderInfoEnum;
|
|
|
import com.fs.hisStore.mapper.FsStorePaymentScrmMapper;
|
|
|
import com.fs.hisStore.param.*;
|
|
|
+import com.fs.hisStore.service.IFsStoreOrderScrmService;
|
|
|
import com.fs.hisStore.service.IFsUserScrmService;
|
|
|
import com.fs.hisStore.vo.FsStoreOrderItemVO;
|
|
|
import com.fs.huifuPay.domain.HuiFuCreateOrder;
|
|
|
@@ -130,38 +131,7 @@ public class LiveOrderController extends AppBaseController
|
|
|
@Autowired
|
|
|
private HuiFuService huiFuService;
|
|
|
|
|
|
- // @Login
|
|
|
- @ApiOperation("物流查询")
|
|
|
- @GetMapping("/test")
|
|
|
- public void test(){
|
|
|
- // 查询出来最近15分钟的订单 待支付 未退款
|
|
|
- List<LiveOrder> list = orderService.selectBankOrder();
|
|
|
- list = new ArrayList<>();
|
|
|
- list.add(orderService.selectLiveOrderByOrderId("36623"));
|
|
|
- for (LiveOrder liveOrder : list) {
|
|
|
- List<LiveOrderPayment> liveOrderPayments = liveOrderPaymentMapper.selectLiveOrderPaymentByOrderId(liveOrder.getOrderId());
|
|
|
- if(liveOrderPayments == null || liveOrderPayments.isEmpty()) continue;
|
|
|
- for (LiveOrderPayment payment : liveOrderPayments) {
|
|
|
- V2TradePaymentScanpayQueryRequest request = new V2TradePaymentScanpayQueryRequest();
|
|
|
- request.setOrgReqDate(new SimpleDateFormat("yyyyMMdd").format(payment.getCreateTime()));
|
|
|
- request.setOrgHfSeqId(payment.getTradeNo());
|
|
|
- HuiFuQueryOrderResult o = null;
|
|
|
- try {
|
|
|
- o = huiFuService.queryOrder(request);
|
|
|
- } catch (Exception e) {
|
|
|
- log.error("查询失败:"+e.getMessage());
|
|
|
- continue;
|
|
|
- }
|
|
|
- log.info("汇付返回"+o);
|
|
|
- if ("00000000".equals(o.getResp_code()) && "S".equals(o.getTrans_stat())) {
|
|
|
- String[] order=o.getOrg_req_seq_id().split("-");
|
|
|
- if ("live".equals(order[0])) {
|
|
|
- orderService.payConfirm(1, null, order[1], o.getOrg_hf_seq_id(), o.getOut_trans_id(), o.getParty_order_id());
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+
|
|
|
|
|
|
|
|
|
/**
|