Browse Source

修改orderMapper.xml

周箭河 5 years ago
parent
commit
4bfc6bafde

+ 11 - 5
src/main/java/com/ym/mec/collectfee/controller/YqPayController.java

@@ -1,6 +1,8 @@
 package com.ym.mec.collectfee.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.ym.mec.collectfee.entity.Order;
+import com.ym.mec.collectfee.service.OrderService;
 import com.ym.mec.collectfee.service.YqPayService;
 import com.ym.mec.collectfee.service.YqQueryService;
 import com.ym.mec.collectfee.service.impl.OrderServiceImpl;
@@ -8,11 +10,13 @@ import com.ym.mec.collectfee.utils.GenerateNum;
 import com.ym.mec.collectfee.utils.yqpay.Msg;
 import com.ym.mec.collectfee.utils.yqpay.YqPayUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -25,7 +29,7 @@ public class YqPayController {
     @Autowired
     private YqQueryService yqQueryService;
     @Autowired
-    private OrderServiceImpl orderService;
+    private OrderService orderService;
 
 
     /**
@@ -37,12 +41,9 @@ public class YqPayController {
     @RequestMapping("/toPay")
     @Transactional
     public Msg toPay(@ModelAttribute Order order) throws Exception {
-
         String orderNo = GenerateNum.getInstance().GenerateOrderNo();
-        System.out.println(order);
         orderService.insert(order);
 
-
         /*卖家双乾商户号*/
         String sellerNo = "0022652"; //某笔定义到某个商户
         /*支付渠道*/
@@ -87,7 +88,12 @@ public class YqPayController {
         resultMap.put("clientIp", "27.18.213.149"); //客户端ip地址(银联H5必填)
         resultMap.put("goodsDetail", goodsDetail);
         Map<String, Object> requestMap = new YqPayUtil(notifyUrl, resultMap).getRequestMap();
-        return yqPayService.toPay(requestMap);
+        Msg msg = yqPayService.toPay(requestMap);
+        if(!msg.getResponseParameters().isEmpty()){
+            Object parse = JSON.parse(msg.getResponseParameters());
+        }
+        System.out.println(parse);
+        return msg;
     }
 
     /**

+ 1 - 1
src/main/resources/config/mybatis/OrderMapper.xml

@@ -44,7 +44,7 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO order (id,oid,user_id,amount,pay,bank,account,u_account,pay_id,pay_time,remark,class_id,status,create_time,po_name,voicy_part,balance,batch_num) VALUES(#{id},#{oid},#{userId},#{amount},#{pay},#{bank},#{account},#{uAccount},#{payId},#{payTime},#{remark},#{classId},#{status},#{createTime},#{poName},#{voicyPart},#{balance},#{batchNum})
+		INSERT INTO `order` (id,oid,user_id,amount,pay,bank,account,u_account,pay_id,pay_time,remark,class_id,status,create_time,po_name,voicy_part,balance,batch_num) VALUES(#{id},#{oid},#{userId},#{amount},#{pay},#{bank},#{account},#{uAccount},#{payId},#{payTime},#{remark},#{classId},#{status},#{createTime},#{poName},#{voicyPart},#{balance},#{batchNum})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->