新版订单修改

admin

2019-01-03 0675aeeabdb2dad6d5f7ff0566dc8de6e0990763

新版订单修改

 fanli/src/main/java/com/yeshi/fanli/controller/client/UserMoneyController.java

@@ -147,7 +147,7 @@
            return;

        }



        BigDecimal balance = userInfoService.getMyHB(uid);

        BigDecimal balance = userInfoService.getUserById(uid).getMyHongBao();



        UserMoneyStatisticVO vo = new UserMoneyStatisticVO();

        vo.setBalanceMoney(balance);


 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/HongBaoOrderMapper.java

@@ -1,5 +1,9 @@
package com.yeshi.fanli.dao.mybatis.order;

import java.util.List;

import org.apache.ibatis.annotations.Param;

import com.yeshi.fanli.dao.BaseMapper;
import com.yeshi.fanli.entity.order.HongBaoOrder;

@@ -7,10 +11,28 @@
    
    /**
     * 根据订单ID查询对象
     * 
     * @param id
     * @return
     */
    HongBaoOrder selectByCommonOrderId(Long id);
    
    /**
     * 返利订单列表（1.4.9之前）
     * 
     * @param uid
     * @param start
     * @param count
     * @return
     */
    List<HongBaoOrder> listFanLiOrder(@Param("uid") Long uid, @Param("start") long start, @Param("count") int count);

    /**
     * 返利订单数量（1.4.9之前）
     * 
     * @param uid
     * @return
     */
    Long countFanLiOrder(Long uid);

}

 fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml

@@ -31,6 +31,36 @@
            <id column="co_order_goods_id" property="id" jdbcType="BIGINT" />
        </association>
    </resultMap>
	
	
    <resultMap id="BaseDetailResultMap" type="com.yeshi.fanli.entity.order.CommonOrder">
        <id column="co_id" property="id" jdbcType="BIGINT" />
        <result column="co_order_no" property="orderNo" jdbcType="VARCHAR" />
        <result column="co_source_type" property="sourceType" jdbcType="INTEGER" />
        <result column="co_source_position" property="sourcePosition"
            jdbcType="VARCHAR" />
        <result column="co_count" property="count" jdbcType="INTEGER" />
        <result column="co_state" property="state" jdbcType="INTEGER" />
        <result column="co_estimate" property="estimate" jdbcType="DECIMAL" />
        <result column="co_eIncome" property="eIncome" jdbcType="DECIMAL" />
        <result column="co_payment" property="payment" jdbcType="DECIMAL" />
        <result column="co_settlement" property="settlement" jdbcType="DECIMAL" />
        <result column="co_third_create_time" property="thirdCreateTime"
            jdbcType="TIMESTAMP" />
        <result column="co_settle_time" property="settleTime" jdbcType="TIMESTAMP" />
        <result column="co_order_by" property="orderBy" jdbcType="INTEGER" />
        <result column="co_create_time" property="createTime" jdbcType="TIMESTAMP" />
        <result column="co_update_time" property="updateTime" jdbcType="TIMESTAMP" />

        <association property="userInfo" column="co_uid"
            javaType="com.yeshi.fanli.entity.bus.user.UserInfo">
            <id column="co_uid" property="id" jdbcType="BIGINT" />
        </association>

        <association property="commonOrderGoods" resultMap="com.yeshi.fanli.dao.mybatis.order.CommonOrderGoodsMapper.BaseResultMap">
		
        </association>
    </resultMap>

    <resultMap id="ResultMap" type="com.yeshi.fanli.vo.order.CommonOrderVO">
        <id column="co_id" property="id" jdbcType="BIGINT" />

 fanli/src/main/java/com/yeshi/fanli/mapping/order/HongBaoOrderMapper.xml

@@ -17,6 +17,24 @@
        </association>

    </resultMap>


    <resultMap id="BaseDetailResultMap" type="com.yeshi.fanli.entity.order.HongBaoOrder">
        <id column="ho_id" property="id" jdbcType="BIGINT" />
        <result column="ho_create_time" property="createTime" jdbcType="TIMESTAMP" />

        <association property="hongBaoV2"
            resultMap="com.yeshi.fanli.dao.mybatis.HongBaoV2Mapper.BaseResultMap">
        </association>

        <association property="commonOrder"
            resultMap="com.yeshi.fanli.dao.mybatis.order.CommonOrderMapper.BaseDetailResultMap">
        </association>

    </resultMap>



    <sql id="Base_Column_List">
        ho_id,ho_hongbao_id,ho_order_id,ho_create_time
    </sql>
@@ -36,8 +54,33 @@
    </select>
    
    
    <select id="listFanLiOrder" resultMap="BaseDetailResultMap">
        SELECT * FROM (SELECT *
        FROM yeshi_ec_hongbao_v2 h WHERE h.`hb_uid`=#{uid} AND h.`hb_type`=1
        ORDER BY h.`hb_create_time` DESC LIMIT #{start},#{count}) hh LEFT JOIN
        yeshi_ec_hongbao_order ho ON ho.`ho_hongbao_id`=hh.hb_id
        LEFT JOIN
        yeshi_ec_common_order co ON co.`co_id`=ho.`ho_order_id` LEFT
        JOIN
        yeshi_ec_common_order_goods g ON
        g.`cog_id`=co.`co_order_goods_id`
    </select>


    <select id="countFanLiOrder" resultType="java.lang.Long"
        parameterType="java.lang.Long">

        SELECT COUNT(h.`hb_id`) FROM yeshi_ec_hongbao_v2 h WHERE
        h.`hb_uid`=#{0} AND
        h.`hb_type`=1
    </select>




    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
        yeshi_ec_hongbao_order where ho_id = #{id,jdbcType=BIGINT}</delete>
        yeshi_ec_hongbao_order where ho_id = #{id,jdbcType=BIGINT}
    </delete>
    <insert id="insert" parameterType="com.yeshi.fanli.entity.order.HongBaoOrder"
        useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_hongbao_order
        (ho_id,ho_hongbao_id,ho_order_id,ho_create_time) values

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoOrderServiceImpl.java

@@ -1,5 +1,7 @@
package com.yeshi.fanli.service.impl.order;



import java.util.List;



import javax.annotation.Resource;



import org.springframework.stereotype.Service;

@@ -8,13 +10,11 @@
import com.yeshi.fanli.entity.order.HongBaoOrder;

import com.yeshi.fanli.service.inter.order.HongBaoOrderService;





@Service

public class HongBaoOrderServiceImpl implements HongBaoOrderService {

    

    @Resource

    private HongBaoOrderMapper hongBaoOrderMapper;





    @Override

    public int insert(HongBaoOrder record) {

@@ -46,4 +46,15 @@
        return hongBaoOrderMapper.selectByPrimaryKey(id);

    }



    @Override

    public List<HongBaoOrder> listFanLiOrder(Long uid, int page, int pageSize) {

        return hongBaoOrderMapper.listFanLiOrder(uid, (page - 1) * pageSize, pageSize);

    }



    @Override

    public long countFanLiOrder(Long uid) {

        Long count = hongBaoOrderMapper.countFanLiOrder(uid);

        return count == null ? 0 : count;

    }



}


 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java

@@ -13,6 +13,7 @@
import javax.annotation.Resource;



import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Propagation;

import org.springframework.transaction.annotation.Transactional;



import com.yeshi.fanli.dao.mybatis.AccountDetailsMapper;

@@ -226,7 +227,6 @@
            return false;

    }



    @Transactional

    @Override

    public void processShopingFanliOrder(Map<String, List<TaoBaoOrder>> orders) {

        // 查询在Order中是否存在该订单号

@@ -841,7 +841,7 @@
    @Resource

    private HongBaoV2Service hongBaoV2Service;



    @Transactional

    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)

    @Override

    public void processShopingFanliOrderNew(String orderId, List<TaoBaoOrder> orderList)

            throws HongBaoException, OrderItemException {


 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java

@@ -5,6 +5,7 @@
import java.util.Map;



import com.yeshi.fanli.entity.order.CommonOrder;

import com.yeshi.fanli.entity.order.HongBaoOrder;

import com.yeshi.fanli.entity.taobao.TaoBaoOrder;

import com.yeshi.fanli.exception.order.CommonOrderException;

import com.yeshi.fanli.vo.order.CommonOrderVO;

@@ -127,4 +128,7 @@
     */

    public CommonOrder addTaoBaoOrder(TaoBaoOrder taoBaoOrder, Long uid) throws CommonOrderException;



	
	


}


 fanli/src/main/java/com/yeshi/fanli/service/inter/order/HongBaoOrderService.java

@@ -1,5 +1,7 @@
package com.yeshi.fanli.service.inter.order;



import java.util.List;



import com.yeshi.fanli.entity.order.HongBaoOrder;



public interface HongBaoOrderService {

@@ -16,4 +18,22 @@
    

    public HongBaoOrder selectByPrimaryKey(Long id);



    /**

     * 老版本的用户返利订单列表

     * 
     * @param uid

     * @param page

     * @param pageSize

     * @return

     */



    public List<HongBaoOrder> listFanLiOrder(Long uid, int page, int pageSize);



    /**

     * 老版本用户返利订单数量

     * 
     * @param uid

     * @return

     */

    public long countFanLiOrder(Long uid);

}