订单查询

src/main/java/com/thinkgem/jeesite/modules/pay/api/OrderApiController.java

+package com.thinkgem.jeesite.modules.pay.api;
+
+import com.thinkgem.jeesite.common.baseBean.Response;
+import com.thinkgem.jeesite.common.constant.ComCode;
+import com.thinkgem.jeesite.common.utils.StringUtils;
+import com.thinkgem.jeesite.modules.pay.bean.OrderRequest;
+import com.thinkgem.jeesite.modules.pay.entity.OrderEntity;
+import com.thinkgem.jeesite.modules.pay.service.OrderService;
+import com.thinkgem.jeesite.modules.sys.entity.Dict;
+import com.thinkgem.jeesite.modules.sys.service.DictService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.method.P;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author niehh
+ * @Description: 订单相关
+ * @date 2018年03月18日 11:04
+ */
+@RestController
+@RequestMapping("/api/order")
+public class OrderApiController {
+
+    @Autowired
+    private OrderService orderService;
+
+    @Autowired
+    private DictService dictService;
+
+    @PostMapping("/getOrderList")
+    public Response getOrderList(OrderRequest request){
+        Response res = new Response();
+        if(request == null || StringUtils.isBlank(request.getSubMerchantCode())){
+            res.setStatus(ComCode.STATUS_CODE_4001);
+            res.setMessage(ComCode.STATUS_CODE_4001_DESC);
+            return res;
+        }
+
+        try {
+            List<OrderEntity> list = orderService.getOrderList(request);
+
+            res.setData(list);
+            res.setStatus(ComCode.STATUS_CODE_2000);
+            res.setMessage(ComCode.STATUS_CODE_2000_DESC);
+        }catch (Exception e){
+            res.setMessage(ComCode.STATUS_CODE_9998_DESC);
+            res.setStatus(ComCode.STATUS_CODE_9998);
+            e.printStackTrace();
+        }
+
+        return res;
+    }
+
+
+    @PostMapping("/getPayMethod")
+    public Response getPayMethod(){
+        Response response = new Response();
+
+        try {
+            Dict dict = new Dict();
+            dict.setType("pay_method");
+            response.setData(dictService.findDictList(dict));
+            response.setStatus(ComCode.STATUS_CODE_2000);
+            response.setMessage(ComCode.STATUS_CODE_2000_DESC);
+        }catch (Exception e){
+            response.setMessage(ComCode.STATUS_CODE_9998_DESC);
+            response.setStatus(ComCode.STATUS_CODE_9998);
+            e.printStackTrace();
+        }
+
+        return response;
+    }
+}

src/main/java/com/thinkgem/jeesite/modules/pay/bean/OrderRequest.java

+package com.thinkgem.jeesite.modules.pay.bean;
+
+import com.thinkgem.jeesite.common.baseBean.Request;
+
+import java.util.Date;
+
+/**
+ * @author niehh
+ * @Description: 订单
+ * @date 2018年03月18日 10:35
+ */
+public class OrderRequest extends Request {
+    private String payChannel;// 支付渠道
+
+    private String payStatus;// 支付状态
+
+    private String startTime;
+
+    private String endTime;
+
+    private Date startDate;
+
+    private Date endDate;
+
+    public String getPayChannel() {
+        return payChannel;
+    }
+
+    public void setPayChannel(String payChannel) {
+        this.payChannel = payChannel;
+    }
+
+    public String getPayStatus() {
+        return payStatus;
+    }
+
+    public void setPayStatus(String payStatus) {
+        this.payStatus = payStatus;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+}

src/main/java/com/thinkgem/jeesite/modules/pay/dao/OrderApiDao.java

+package com.thinkgem.jeesite.modules.pay.dao;
+
+import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
+import com.thinkgem.jeesite.modules.pay.bean.OrderRequest;
+import com.thinkgem.jeesite.modules.pay.entity.OrderEntity;
+
+import java.util.List;
+
+/**
+ * @author niehh
+ * @Description: 订单
+ * @date 2018年03月18日 10:32
+ */
+
+@MyBatisDao
+public interface OrderApiDao {
+    public List<OrderEntity> getOrderList(OrderRequest request);
+}
\ No newline at end of file

src/main/java/com/thinkgem/jeesite/modules/pay/entity/OrderEntity.java

@@ -16,6 +16,10 @@ public class OrderEntity extends BaseEntity implements Serializable {
     private String payType; // 交易类型 5借记卡 6贷记卡
     private String cardCode; // 支付卡code
 
+    private String payChannelName;
+
+    private String createDate;
+
     public OrderEntity() {
     }
 
@@ -114,4 +118,24 @@ public class OrderEntity extends BaseEntity implements Serializable {
     public void setCardCode(String cardCode) {
         this.cardCode = cardCode;
     }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public String getPayChannelName() {
+        return payChannelName;
+    }
+
+    public void setPayChannelName(String payChannelName) {
+        this.payChannelName = payChannelName;
+    }
+
+    public void setCreateDate(String createDate) {
+        if(createDate!=null && createDate.length() == 21){
+            createDate = createDate.substring(0,19);
+        }
+        this.createDate = createDate;
+    }
+
 }

src/main/java/com/thinkgem/jeesite/modules/pay/service/OrderService.java

+package com.thinkgem.jeesite.modules.pay.service;
+
+import com.thinkgem.jeesite.common.utils.DateUtils;
+import com.thinkgem.jeesite.modules.pay.bean.OrderRequest;
+import com.thinkgem.jeesite.modules.pay.dao.OrderApiDao;
+import com.thinkgem.jeesite.modules.pay.entity.OrderEntity;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * @author niehh
+ * @Description: 订单
+ * @date 2018年03月18日 10:51
+ */
+@Service
+@Transactional(readOnly = true)
+public class OrderService {
+
+    @Autowired
+    private OrderApiDao orderApiDao;
+
+    public List<OrderEntity> getOrderList(OrderRequest request){
+        if(request.getStartDate()!= null){
+            request.setStartTime(DateUtils.formatDate(request.getStartDate(),"yyyy-MM-dd") + " 00:00:00");
+        }
+        if(request.getEndDate() != null){
+            request.setEndTime(DateUtils.formatDate(request.getEndDate(),"yyyy-MM-dd") + " 23:59:59");
+        }
+
+        return orderApiDao.getOrderList(request);
+
+    }
+
+}

src/main/java/com/thinkgem/jeesite/modules/sys/dao/DictDao.java

@@ -18,5 +18,7 @@ import com.thinkgem.jeesite.modules.sys.entity.Dict;
 public interface DictDao extends CrudDao<Dict> {
 
 	public List<String> findTypeList(Dict dict);
+
+	public List<Dict> findDictList(Dict dict);
 	
 }

src/main/java/com/thinkgem/jeesite/modules/sys/service/DictService.java

@@ -43,4 +43,8 @@ public class DictService extends CrudService<DictDao, Dict> {
 		CacheUtils.remove(DictUtils.CACHE_DICT_MAP);
 	}
 
+	public List<Dict> findDictList(Dict dict){
+		return dao.findDictList(dict);
+	}
+
 }

src/main/resources/mappings/modules/pay/OrderApiDao.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.thinkgem.jeesite.modules.pay.dao.OrderApiDao">
+
+    <select id="getOrderList" resultType="com.thinkgem.jeesite.modules.pay.entity.OrderEntity">
+        SELECT
+            o.pay_code,
+            o.pay_no,
+            o.pay_status,
+            o.pay_type,
+            o.pay_channel,
+            o.amount,
+            o.create_date,
+            o.`subject`,
+            sd.label AS "payChannelName"
+        FROM
+            `youka_orders` o
+        LEFT JOIN sys_dict sd ON sd.value = o.pay_channel
+        WHERE o.del_flag = 0
+        AND o.user_code = #{subMerchantCode}
+        <if test="payChannel != null and payChannel != ''">
+            AND o.pay_channel = #{payChannel}
+        </if>
+        <if test="payStatus != null and payStatus != ''">
+            AND o.pay_status = #{payStatus}
+        </if>
+        <if test="startTime != null and startTime != ''">
+            AND o.create_date &gt;= #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND o.create_date &lt;= #{endTime}
+        </if>
+
+    </select>
+</mapper>
\ No newline at end of file

src/main/resources/mappings/modules/sys/DictDao.xml

@@ -91,5 +91,18 @@
 			del_flag = #{DEL_FLAG_DELETE}
 		WHERE id = #{id}
 	</update>
-	
+
+	<select id="findDictList" resultType="com.thinkgem.jeesite.modules.sys.entity.Dict">
+		SELECT
+		value,
+		label
+		FROM sys_dict
+		WHERE del_flag = #{DEL_FLAG_NORMAL}
+		<if test="type != null and type != ''">
+			AND type = #{type}
+		</if>
+
+		ORDER BY sort DESC
+	</select>
+
 </mapper>
\ No newline at end of file