订单

yujian

2019-12-12 ee8b78e5e2aef07745bfaac8b8b1b110d6789f66

订单

 fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java

@@ -216,14 +216,17 @@


            // 查询是否维权

            for (CommonOrderVO order : list) {

                if (order.getUserInfo() == null || order.getUserInfo().getId() == null)

                    continue;

				
                // 查询是否维权

                TaoBaoWeiQuanOrder weiQuanOrder = taoBaoWeiQuanOrderService.listByorderItemId(order.getTradeId());

                if (weiQuanOrder != null)// 有维权

                {

                    order.setWeiQuanState(weiQuanOrder.getState());

                    order.setState(CommonOrder.STATE_WQ);

                    TaoBaoWeiQuanDrawBack drawBack = taoBaoWeiQuanDrawBackService

                            .selectByOrderItemId(weiQuanOrder.getOrderItemId());

                    TaoBaoWeiQuanDrawBack drawBack = taoBaoWeiQuanDrawBackService.selectByOrderItemIdAndUid(weiQuanOrder.getOrderItemId(),

                            order.getUserInfo().getId());

                    if (drawBack != null) {// 已经退款



                        // 计算退款资金


 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java

@@ -255,6 +255,10 @@
            if (tb == null)// 淘宝是空值

            {

                String jdId = JDUtil.getJDGoodsId(text);

                if (StringUtil.isNullOrEmpty(jdId)) {

                    jdId = JDUtil.getJDGoodsIdByWeiXin(text);

                }

				
                if (!StringUtil.isNullOrEmpty(jdId)) {

                    JDGoods goods = JDApiUtil.getGoodsDetail(Long.parseLong(jdId));

                    if (goods != null) {


 fanli/src/main/java/com/yeshi/fanli/mapping/hongbao/HongBaoV2CountMapper.xml

@@ -443,9 +443,6 @@
            <if test="moneyState != null and moneyState == 2"> <!-- 已到账 -->
                AND v.hb_state = 3
            </if>
            <if test="moneyState != null and moneyState == 3"> <!-- 红包已失效、整个订单失效 -->
                AND v.hb_state =4 AND co.co_state_whole_order = 3
            </if>
        )v2
        LEFT JOIN yeshi_ec_hongbao_order ho ON ho.`ho_hongbao_id` = IF(v2.hb_pid IS NULL,v2.hb_id,v2.hb_pid)
        LEFT JOIN yeshi_ec_common_order co ON co.`co_id` = ho.`ho_order_id`
@@ -469,6 +466,10 @@
            AND PERIOD_DIFF(DATE_FORMAT(NOW(), '%Y%m'), DATE_FORMAT(co.`co_third_create_time`, '%Y%m')) = 1
        </if>
        
        <if test="moneyState != null and moneyState == 3"> <!-- 红包已失效、整个订单失效 -->
            AND v.hb_state =4 AND co.co_state_whole_order = 3
        </if>
		
        <if test="orderState ==  1"> <!-- 有效订单: 整个订单有效 -->
            AND <![CDATA[co.`co_state` <> 3]]>
            AND (co.co_state_whole_order = 1 or co.co_state_whole_order = 2)

 fanli/src/main/java/com/yeshi/fanli/mapping/redpack/RedPackWinInviteMapper.xml

@@ -70,6 +70,19 @@
    WHERE d.`rwr_uid` = #{uid} AND d.`rwr_team_uid` = #{teamUid} AND d.`rwr_type` = #{type}
  </select>
  
  <select id="getByUidAndTeamUidAndType" resultMap="BaseResultMap">
      SELECT * FROM yeshi_ec_red_pack_win_invite d
    WHERE d.`rwr_uid` = #{uid} AND d.`rwr_team_uid` = #{teamUid} AND d.`rwr_type` = #{type}
    LIMIT 1
  </select>
  
  <select id="getByUidAndTeamUidAndTypeMonth" resultMap="BaseResultMap">
      SELECT * FROM yeshi_ec_red_pack_win_invite d
    WHERE d.`rwr_uid` = #{uid} AND d.`rwr_team_uid` = #{teamUid} AND d.`rwr_type` = #{type}
          AND DATE_FORMAT(d.rwr_create_time,'%Y%m') = DATE_FORMAT(CURDATE(),'%Y%m') 
    LIMIT 1
  </select>
  
  
  <select id="getRewardList" resultMap="BaseResultMap">
      SELECT * FROM yeshi_ec_red_pack_win_invite d

 fanli/src/main/java/com/yeshi/fanli/service/impl/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java

@@ -574,6 +574,11 @@
    }



    @Override

    public TaoBaoWeiQuanDrawBack selectByOrderItemIdAndUid(String orderItemId, Long uid) {

        return taoBaoWeiQuanDrawBackMapper.selectByOrderItemIdAndUid(orderItemId,uid);

    }

	
    @Override

    public TaoBaoWeiQuanDrawBack selectByHongBaoId(Long hbId) {

        Long uid = null;

        HongBaoV2 hb = hongBaoV2Mapper.selectByPrimaryKey(hbId);


 fanli/src/main/java/com/yeshi/fanli/service/inter/money/tb/TaoBaoWeiQuanDrawBackService.java

@@ -49,4 +49,12 @@
     */

    public  TaoBaoWeiQuanDrawBack selectByHongBaoId(Long hbId);



    /**

     * 维权信息  订单号 + uid

     * @param orderItemId

     * @param uid

     * @return

     */

    public TaoBaoWeiQuanDrawBack selectByOrderItemIdAndUid(String orderItemId, Long uid);



}


 fanli/src/main/java/com/yeshi/fanli/util/jd/JDUtil.java

@@ -29,6 +29,7 @@
import org.yeshi.utils.HttpUtil;



import com.yeshi.fanli.dto.GoodsClassDTO;

import com.yeshi.fanli.dto.douyin.DouYinGoods;

import com.yeshi.fanli.dto.jd.JDCommissionInfo;

import com.yeshi.fanli.dto.jd.JDCouponInfo;

import com.yeshi.fanli.dto.jd.JDPingouInfo;

@@ -625,6 +626,35 @@
        return null;

    }



	
    /**

     * 通过链接id

     * @param url

     * @return

     */

    public static String getJDGoodsIdByWeiXin(String url) {

        if (StringUtil.isNullOrEmpty(url)) 
            return null;

		
        try {

            String id = null;

            int indexOf = url.indexOf("?");

            url = url.substring(indexOf + 1, url.length()-1);

            String[] temp = url.split("&");

            for (int i =0; i < temp.length; i ++) {

                 String content = temp[i];

                if (content.startsWith("sku")) {

                    id = content.split("=")[content.split("=").length-1];

                    break;

                } 
            }

            return id;

        } catch (Exception e) {

            e.printStackTrace();

        }

        return null;

    }

	
    /**

     * 查询天猫商品图片、标题

     *