yujian
2019-11-26 cecbeffa516f4f3cbba47f6927428ccd5244cf97
饿了么订单
5个文件已修改
1个文件已添加
199 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/admin/order/ElmeOrderController.java 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/elme/ElmeOrderMapper.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/elme/ElmeOrder.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/mapping/elme/ElmeOrderMapper.xml 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/elme/ElmeOrderServiceImpl.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/inter/elme/ElmeOrderService.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/admin/order/ElmeOrderController.java
New file
@@ -0,0 +1,82 @@
package com.yeshi.fanli.controller.admin.order;
import java.io.PrintWriter;
import java.lang.reflect.Type;
import java.util.Date;
import java.util.List;
import javax.annotation.Resource;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.JsonUtil;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonElement;
import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
import com.yeshi.fanli.entity.elme.ElmeOrder;
import com.yeshi.fanli.service.inter.elme.ElmeOrderService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.TimeUtil;
import net.sf.json.JSONObject;
@Controller
@RequestMapping("admin/new/api/v1/elmeOrder")
public class ElmeOrderController {
    @Resource
    private ElmeOrderService elmeOrderService;
    /**
     * 订单列表查询
     * @param callback
     * @param pageIndex
     * @param key
     * @param out
     */
    @RequestMapping(value = "query")
    public void query(String callback, Integer pageIndex, String key, PrintWriter out) {
        try {
            if (pageIndex == null || pageIndex < 0) {
                pageIndex = 1;
            }
            int pageSize = Constant.PAGE_SIZE;
            List<ElmeOrder> list = elmeOrderService.query((pageIndex-1)* pageSize, pageSize, key);
            if (list == null || list.size() == 0) {
                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无数据"));
                return;
            }
            long count = elmeOrderService.count(key);
            int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
            PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
            Gson gson = new GsonBuilder().registerTypeAdapter(Date.class, new JsonSerializer<Date>() {
                @Override
                public JsonElement serialize(Date value, Type theType, JsonSerializationContext context) {
                    if (value == null) {
                        return new JsonPrimitive("");
                    } else {
                        return new JsonPrimitive(TimeUtil.getGernalTime(value.getTime(), "yyyy-MM-dd HH:mm:ss"));
                    }
                }
            }).create();
            JSONObject data = new JSONObject();
            data.put("pe", pe);
            data.put("result_list", gson.toJson(list));
            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
        } catch (Exception e) {
            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("查询失败"));
            e.printStackTrace();
        }
    }
}
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/elme/ElmeOrderMapper.java
@@ -1,5 +1,9 @@
package com.yeshi.fanli.dao.mybatis.elme;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.yeshi.fanli.dao.BaseMapper;
import com.yeshi.fanli.entity.elme.ElmeOrder;
@@ -12,4 +16,15 @@
     */
    ElmeOrder selectByOrderId(String orderId);
    /**
     * 订单查询列表
     * @param start
     * @param count
     * @param key
     * @return
     */
    List<ElmeOrder> query(@Param("start") long start, @Param("count")int count, @Param("key")String key);
    long count(@Param("key")String key);
}
fanli/src/main/java/com/yeshi/fanli/entity/elme/ElmeOrder.java
@@ -56,6 +56,11 @@
    @Column(name = "eo_update_time")
    private Date updateTime;
    private Long uid;
    private BigDecimal hongbao;
    private Integer hbState;
    public Long getId() {
        return id;
    }
@@ -200,4 +205,27 @@
        this.updateTime = updateTime;
    }
    public Long getUid() {
        return uid;
    }
    public void setUid(Long uid) {
        this.uid = uid;
    }
    public BigDecimal getHongbao() {
        return hongbao;
    }
    public void setHongbao(BigDecimal hongbao) {
        this.hongbao = hongbao;
    }
    public Integer getHbState() {
        return hbState;
    }
    public void setHbState(Integer hbState) {
        this.hbState = hbState;
    }
}
fanli/src/main/java/com/yeshi/fanli/mapping/elme/ElmeOrderMapper.xml
@@ -28,6 +28,38 @@
        <result column="eo_create_time" property="createTime" jdbcType="TIMESTAMP" />
        <result column="eo_update_time" property="updateTime" jdbcType="TIMESTAMP" />
    </resultMap>
    <resultMap id="ResultMap" type="com.yeshi.fanli.entity.elme.ElmeOrder">
        <id column="eo_id" property="id" jdbcType="BIGINT" />
        <result column="eo_channel_id" property="channelId" jdbcType="VARCHAR" />
        <result column="eo_channel_name" property="channelName"
            jdbcType="VARCHAR" />
        <result column="eo_track_pid" property="trackPid" jdbcType="VARCHAR" />
        <result column="eo_rid" property="rid" jdbcType="VARCHAR" />
        <result column="eo_order_date" property="orderDate" jdbcType="TIMESTAMP" />
        <result column="eo_order_id" property="orderId" jdbcType="VARCHAR" />
        <result column="eo_pay_money" property="payMoney" jdbcType="DECIMAL" />
        <result column="eo_city" property="city" jdbcType="VARCHAR" />
        <result column="eo_coupon_money" property="couponMoney"
            jdbcType="DECIMAL" />
        <result column="eo_newer_first_order" property="newerFirstOrder"
            jdbcType="INTEGER" />
        <result column="eo_newer_repay_order" property="newerRepayOrder"
            jdbcType="INTEGER" />
        <result column="eo_taoke_hongbao" property="taokeHongBao"
            jdbcType="INTEGER" />
        <result column="eo_shop_click" property="shopClick" jdbcType="INTEGER" />
        <result column="eo_recieve_coupon_7day_first_order" property="recieveCoupon7DayFirstOrder"
            jdbcType="INTEGER" />
        <result column="eo_settle" property="isSettle" jdbcType="BOOLEAN" />
        <result column="eo_create_time" property="createTime" jdbcType="TIMESTAMP" />
        <result column="eo_update_time" property="updateTime" jdbcType="TIMESTAMP" />
        <result column="hb_uid" property="uid" jdbcType="BIGINT" />
        <result column="hb_money" property="hongbao" jdbcType="DECIMAL" />
        <result column="hb_state" property="hbState" jdbcType="INTEGER" />
    </resultMap>
    <sql id="Base_Column_List">eo_id,eo_channel_id,eo_channel_name,eo_track_pid,eo_rid,eo_order_date,eo_order_id,eo_pay_money,eo_city,eo_coupon_money,eo_newer_first_order,eo_newer_repay_order,eo_taoke_hongbao,eo_shop_click,eo_recieve_coupon_7day_first_order,eo_settle,eo_create_time,eo_update_time
    </sql>
    <select id="selectByPrimaryKey" resultMap="BaseResultMap"
@@ -44,6 +76,24 @@
        from yeshi_ec_elme_order where eo_order_id = #{0}
    </select>
    
    <select id="query" resultMap="ResultMap">
        SELECT d.*,v2.`hb_state`,v2.`hb_uid`,v2.`hb_money` FROM `yeshi_ec_elme_order` d
        LEFT JOIN `yeshi_ec_elme_order_hongbao` h ON d.`eo_id` = h.`eoh_order_id`
        LEFT JOIN `yeshi_ec_hongbao_v2` v2 ON v2.`hb_id` = h.`eoh_hongbao_id`
        WHERE d.`eo_order_id` LIKE '${key}%' OR v2.`hb_uid` LIKE '${key}%'
        ORDER BY d.`eo_create_time` DESC
        LIMIT #{start},#{count}
    </select>
    <select id="count" resultType="java.lang.Long">
        SELECT IFNULL(COUNT(d.`eo_id`),0) FROM `yeshi_ec_elme_order` d
        LEFT JOIN `yeshi_ec_elme_order_hongbao` h ON d.`eo_id` = h.`eoh_order_id`
        LEFT JOIN `yeshi_ec_hongbao_v2` v2 ON v2.`hb_id` = h.`eoh_hongbao_id`
        WHERE d.`eo_order_id` LIKE '${key}%' OR v2.`hb_uid` LIKE '${key}%'
    </select>
    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
        yeshi_ec_elme_order where eo_id = #{id,jdbcType=BIGINT}</delete>
    <insert id="insert" parameterType="com.yeshi.fanli.entity.elme.ElmeOrder"
fanli/src/main/java/com/yeshi/fanli/service/impl/elme/ElmeOrderServiceImpl.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.service.impl.elme;
import java.util.Date;
import java.util.List;
import javax.annotation.Resource;
@@ -45,4 +46,14 @@
    public ElmeOrder selectByPrimaryKey(Long id) {
        return elmeOrderMapper.selectByPrimaryKey(id);
    }
    @Override
    public List<ElmeOrder> query(long start, int count, String key) {
        return elmeOrderMapper.query(start, count, key);
    }
    @Override
    public long count(String key) {
        return elmeOrderMapper.count(key);
    }
}
fanli/src/main/java/com/yeshi/fanli/service/inter/elme/ElmeOrderService.java
@@ -1,5 +1,7 @@
package com.yeshi.fanli.service.inter.elme;
import java.util.List;
import com.yeshi.fanli.entity.elme.ElmeOrder;
import com.yeshi.fanli.exception.elme.ElmeOrderException;
@@ -19,4 +21,15 @@
    public ElmeOrder selectByPrimaryKey(Long id);
    /**
     * 订单列表查询
     * @param start
     * @param count
     * @param key
     * @return
     */
    public List<ElmeOrder> query(long start, int count, String key);
    public long count(String key);
}