提交代码

bweb/src/main/java/com/bweb/controller/TestController.java

@@ -18,6 +18,8 @@ import com.hfkj.service.goods.GoodsUserAddressService;
 import com.hfkj.service.hlt.HltCanteenService;
 import com.hfkj.service.hlt.HuiLianTongUnionCardService;
 import com.hfkj.service.order.BsOrderChildService;
+import com.hfkj.service.pay.huift.TradeService;
+import com.hfkj.service.pay.huift.config.HuiftConfig;
 import com.hfkj.sysenum.order.OrderLogisticsStatusEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -60,6 +62,23 @@ public class TestController {
 
     @Resource
     private GoodsUserAddressService addressService;
+    @Resource
+    private TradeService huiftTradeService;
+    @RequestMapping(value="/thirdPayResult",method = RequestMethod.GET)
+    @ResponseBody
+    @ApiOperation(value = "查询V家园订单交易状态")
+    public ResponseData thirdPayResult(@RequestParam(value = "preOrderNo" , required = true) String preOrderNo,
+                                       @RequestParam(value = "shopCode" , required = true) String shopCode,
+                                       @RequestParam(value = "signSecret" , required = true) String signSecret) {
+        try {
+
+            return ResponseMsgUtil.success(huiftTradeService.thirdPayResult(preOrderNo,shopCode,signSecret));
+
+        } catch (Exception e) {
+            log.error("error!",e);
+            return ResponseMsgUtil.exception(e);
+        }
+    }
 
     @RequestMapping(value="/canteenConsume",method = RequestMethod.GET)
     @ResponseBody

order/src/main/java/com/order/controller/OrderPayController.java

@@ -207,8 +207,8 @@ public class OrderPayController {
             // 请求支付渠道
             JSONObject thirdPreOrder = huiftTradeService.thirdPreOrder(order , shopCode , signSecret);
             for (OrderChildModel orderChild : order.getOrderChildList()) {
-                orderChild.setSettleAccount(HuiftConfig.shopcode);
-                orderChild.setSettleAccountKey(HuiftConfig.signSecret);
+                orderChild.setSettleAccount(shopCode);
+                orderChild.setSettleAccountKey(signSecret);
                 orderChildService.editData(orderChild);
             }