修改

YijiaRestful/src/main/java/com/platform/yijia/controller/PayController.java

@@ -155,8 +155,8 @@ public class PayController {
                     reqData.put("ordNo", payOrder.getOrderNo()); //商户订单号
                     reqData.put("mno", mno); //商户编号
                     //reqData.put("subMechId", ""); //子商户号
-                    //reqData.put("amt", payOrder.getAmt()); //订单总金额
-                    reqData.put("amt", "0.01");
+                    reqData.put("amt", payOrder.getAmt()); //订单总金额
+                    //reqData.put("amt", "0.01");
                     //reqData.put("discountAmt", ""); //参与优惠金额
                     //reqData.put("unDiscountAmt", ""); //不参与优惠金额
                     reqData.put("payType", "WECHAT"); //支付渠道
@@ -499,12 +499,14 @@ public class PayController {
                                             customerManage.setBlogOpenid(u.getBlogOpenid());
                                             customerManage.setBlogUserId(u.getUserId());
                                             customerManage.setPhoneNumber(u.getMobilePhone());
+                                            customerManage.setCustomerName(u.getBlogNickName());
                                             blogRegTime =u.getRegisteDate();
                                             break;
                                         case "2":
                                             customerManage.setMinaOpenid(u.getMinaOpenid());
                                             customerManage.setMinaUserId(u.getUserId());
                                             customerManage.setPhoneNumber(u.getMobilePhone());
+                                            customerManage.setCustomerName(u.getBlogNickName());
                                             minaRegTime = u.getRegisteDate();
                                             break;
                                     }

YijiaRestful/src/main/resources/mapper/PayOrderMapper.xml

@@ -725,6 +725,7 @@
   <select id="getUserInfoByOpenId" parameterType="com.platform.yijia.pojo.AppUserInfo" resultType="com.platform.yijia.pojo.AppUserInfo">
     SELECT
         user_id 		 AS userId,
+        blog_nick_name   AS blogNickName,
         mina_openid      AS minaOpenid,
         blog_openid      AS blogOpenid,
         registe_date     AS registeDate,
@@ -772,8 +773,8 @@
     UPDATE
         customer_manage
     <set>
-        <if test="memberGrade !=null ">
-          member_grade = #{memberGrade},
+        <if test="customerName !=null ">
+          customer_name = #{customerName},
         </if>
         <if test="phoneNumber !=null ">
           phone_number = #{phoneNumber},

YijiaRestful/src/main/resources/mapper/StationOilGunMapper.xml

@@ -324,8 +324,9 @@
         device_no    AS printerSn
     FROM  station_device_manage
     <where>
+            device_status = "1"
         <if test="oilGunNo != null and oilGunNo !=''">
-          FIND_IN_SET(#{oilGunNo}, gun_no)
+          AND FIND_IN_SET(#{oilGunNo}, gun_no)
         </if>
         <if test="stationId != null and stationId !=''">
           AND station_id = #{stationId}