Merge branch 'div1'

yujian

2019-01-05 4220ceb661146c58d1d6855f14dcdcc3d8c7bb24

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

@@ -3,7 +3,6 @@
import java.math.BigDecimal;

import java.text.SimpleDateFormat;

import java.util.ArrayList;

import java.util.Calendar;

import java.util.Date;

import java.util.HashMap;

import java.util.List;

@@ -18,6 +17,7 @@
import com.yeshi.fanli.dao.mybatis.order.CommonOrderGoodsMapper;

import com.yeshi.fanli.dao.mybatis.order.CommonOrderMapper;

import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;

import com.yeshi.fanli.entity.bus.user.HongBao;

import com.yeshi.fanli.entity.bus.user.HongBaoV2;

import com.yeshi.fanli.entity.bus.user.UserInfo;

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

@@ -174,7 +174,8 @@
               Integer hongBaoType = order.getHongBaoType();

               // 邀请订单信息保护

               if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType

                     || HongBaoV2.TYPE_ERJI == hongBaoType) {

                     || HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType

                     || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {

                  Map<String, String> titleMap = new HashMap<String, String>();

                  titleMap.put("content", "为保障用户隐私，商品信息已隐藏!");

                  titleMap.put("fontColor", "#888888");

@@ -240,8 +241,8 @@
            orderStateContent = "已维权";



            /* 订单维权 判断是否全部维权 */

            List<TaoBaoWeiQuanOrder> listWQ = taoBaoWeiQuanOrderMapper

                  .selectListByOrderIdAndState(order.getOrderNo(), "维权成功");

            List<TaoBaoWeiQuanOrder> listWQ = 
                  taoBaoWeiQuanOrderMapper.selectListByOrderIdAndState(order.getOrderNo(), "维权成功");



            boolean isPart = false;// 默认失效



@@ -277,14 +278,14 @@
            hongbaoInfo = "返利";

            order.setOrderOrigin("1");

            order.setHongBaoTypePic(CommonOrder.TYPE_FANLI);

         } else if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType

               || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {

         } else if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType) {

            // 分享

            hongbaoInfo = "奖金";

            order.setOrderOrigin("2");

            order.setHongBaoTypePic(CommonOrder.TYPE_SHARE);

         } else if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType

               || HongBaoV2.TYPE_ERJI == hongBaoType) {

               || HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType

               || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {

            // 邀请

            hongbaoInfo = "奖金";

            order.setOrderOrigin("3");

@@ -393,6 +394,8 @@
         commonOrder.setUserInfo(new UserInfo(uid));

         commonOrder.setCreateTime(new Date());

         commonOrderMapper.insertSelective(commonOrder);

			


         return commonOrder;

      } else {// 修改

         // 已经结算或者已经失效的订单不处理

@@ -411,4 +414,10 @@
         return commonOrderMapper.selectByPrimaryKey(updateCommonOrder.getId());

      }

   }



   @Override

   public Map<String, Object> countMoneyGroupOrderNoByUid(Long uid, Integer type, String orderNo, String startTime,

         String endTime, Integer day) {

      return commonOrderMapper.countMoneyGroupOrderNoByUid(uid, type, orderNo, startTime, endTime, day);

   }

}