获取用户订单列表

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

@@ -85,4 +85,35 @@ public class PayOrderController {
         }
         return gson.toJson(resultData);
     }
+
+    /*
+     * 根据用户openId和用户类型userType查询用户订单
+     * @param orderNo
+     * @param openId
+     * @param userType
+     * @return
+     */
+    @RequestMapping(value = "/getOrderListByOpenIdAndUserType", method = RequestMethod.GET)
+    @ResponseBody
+    public String getOrderListByOpenIdAndUserType(@RequestParam("openId") String openId, @RequestParam("userType") String userType){
+        Gson gson =new Gson();
+        ResultData resultData =null;
+            if(StringUtils.isNotBlank(openId) && StringUtils.isNotBlank(userType)){
+                AppUserInfo appUserInfo = new AppUserInfo();
+                switch (userType){
+                    case "1":
+                        appUserInfo.setBlogOpenid(openId);
+                        break;
+                    case "2":
+                        appUserInfo.setMinaOpenid(openId);
+                        break;
+                }
+                List<PayOrder> payOrderList = payOrderService.getOrderListByOpenIdAndUserType(appUserInfo);
+                resultData=ResultData.success(payOrderList);
+            }else {
+                resultData=ResultData.error(CodeMsg.SEARCH_FAIL);
+            }
+
+        return gson.toJson(resultData);
+    }
 }

YijiaRestful/src/main/java/com/platform/yijia/dao/PayOrderMapper.java

@@ -12,6 +12,13 @@ import org.apache.ibatis.annotations.Param;
 public interface PayOrderMapper {
 
     /*
+     * 根据用户openId和用户类型userType查询用户订单
+     * @param payOrder
+     * @return
+     */
+    List<PayOrder> getOrderListByOpenIdAndUserType(AppUserInfo appUserInfo);
+
+    /*
      *修改订单状态
      */
     int updateOrderStatus(PayOrder payOrder);

YijiaRestful/src/main/java/com/platform/yijia/service/PayOrderService.java

@@ -26,6 +26,13 @@ public interface PayOrderService {
     List<AppUserInfo> getUserInfoByOpenId(AppUserInfo appUserInfo);
 
     /*
+     * 根据用户openId和用户类型userType查询用户订单
+     * @param payOrder
+     * @return
+     */
+    List<PayOrder> getOrderListByOpenIdAndUserType(AppUserInfo appUserInfo);
+
+    /*
      * 根据订单号查询订单信息和用户信息  注：此方法在随行付回调校验之后修改状态完成后
      * @param payOrder
      * @return

YijiaRestful/src/main/java/com/platform/yijia/service/impl/PayOrderServiceImpl.java

@@ -198,6 +198,16 @@ public class PayOrderServiceImpl implements PayOrderService {
     }
 
     /*
+     * 根据用户openId和用户类型userType查询用户订单
+     * @param payOrder
+     * @return
+     */
+    @Override
+    public List<PayOrder> getOrderListByOpenIdAndUserType(AppUserInfo appUserInfo) {
+        return payOrderMapper.getOrderListByOpenIdAndUserType(appUserInfo);
+    }
+
+    /*
      * 根据订单号查询订单信息和用户信息  注：此方法在随行付回调校验之后修改状态完成后
      * @param payOrder
      * @return

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

@@ -131,6 +131,40 @@
     print_count, car_no, customer_phone, customer_grade, oil_type
   </sql>
 
+  <!--根据用户openId和用户类型userType查询用户订单-->
+  <select id="getOrderListByOpenIdAndUserType" parameterType="com.platform.yijia.pojo.AppUserInfo" resultType="com.platform.yijia.pojo.PayOrder">
+    SELECT
+        B.order_no              AS orderNo,
+        B.oil_gun               AS oilGun,
+        B.oil_name              AS oilName,
+        B.consumer              AS consumer,
+        B.order_liters          AS orderLiters,
+        B.pay_date              AS payDate,
+        B.amt                   AS amt,
+        B.created_date          AS createdDate,
+        B.oil_pirce             AS oilPirce,
+        B.station_name          AS stationName,
+        B.receivable_amt        AS receivableAmt,
+        B.discount_amt          AS discountAmt,
+        B.score                 AS score,
+        B.discount_coupon_amt   AS discountCouponAmt
+    FROM
+        app_user_info AS A  LEFT JOIN pay_order AS B ON A.user_id = B.consumer_id
+    <where>
+      <if test="userType != null and userType !=''">
+        A.user_type = #{userType}
+      </if>
+      <if test="blogOpenid != null and blogOpenid !=''">
+        AND A.blog_openid = #{blogOpenid}
+      </if>
+      <if test="minaOpenid != null and minaOpenid !=''">
+        AND A.mina_openid = #{minaOpenid}
+      </if>
+    </where>
+    ORDER BY B.created_date DESC
+  </select>
+
+
   <!-- 查询加油员-->
   <select id="selectPersonelName" parameterType="map" resultType="map">
     SELECT