权益订单列表

README.md

@@ -52,5 +52,6 @@
     http://120.25.146.52:3090/project/102/interface/api/9758
 2.新增权益添加参数
     http://120.25.146.52:3090/project/102/interface/api/5744
-3.
+3.权益订单列表
+    http://120.25.146.52:3090/project/102/interface/api/5936
 ~~~~

src/main/java/com/fdkankan/manage/service/IIncrementOrderMgService.java

@@ -2,6 +2,7 @@ package com.fdkankan.manage.service;
 
 import com.fdkankan.manage.entity.IncrementOrderMg;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.manage.entity.IncrementType;
 import com.fdkankan.manage.vo.request.UserIncrementParam;
 
 /**
@@ -14,5 +15,5 @@ import com.fdkankan.manage.vo.request.UserIncrementParam;
  */
 public interface IIncrementOrderMgService extends IService<IncrementOrderMg> {
 
-    void addOrder(UserIncrementParam param);
+    void addOrder(UserIncrementParam param, IncrementType incrementType);
 }

src/main/java/com/fdkankan/manage/service/IUserIncrementService.java

@@ -36,4 +36,6 @@ public interface IUserIncrementService extends IService<UserIncrement> {
 
 
     void delAgentId(Integer agentId);
+
+    List<UserIncrement> getByOrderSn(String orderSn);
 }

src/main/java/com/fdkankan/manage/service/impl/IncrementOrderMgServiceImpl.java

@@ -3,6 +3,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 import com.fdkankan.manage.entity.IncrementOrderMg;
+import com.fdkankan.manage.entity.IncrementType;
 import com.fdkankan.manage.mapper.IIncrementOrderMgMapper;
 import com.fdkankan.manage.service.IIncrementOrderMgService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -22,14 +23,20 @@ import org.springframework.stereotype.Service;
 public class IncrementOrderMgServiceImpl extends ServiceImpl<IIncrementOrderMgMapper, IncrementOrderMg> implements IIncrementOrderMgService {
 
     @Override
-    public void addOrder(UserIncrementParam param) {
+    public void addOrder(UserIncrementParam param, IncrementType incrementType) {
         IncrementOrderMg incrementOrderMg = new IncrementOrderMg();
         incrementOrderMg.setOrderSn(Dateutils.getOrderSn());
         incrementOrderMg.setUserId(param.getUserId());
         incrementOrderMg.setCount(param.getCount());
+        incrementOrderMg.setPayStatus(1);
         incrementOrderMg.setAbroad(0);
         incrementOrderMg.setIncrementType(param.getIncrementTypeId());
-        incrementOrderMg.setMemberLevels("");
+        if(incrementType.getValidTimeType() == 0){
+            incrementOrderMg.setMemberLevels("PR");
+        }
+        if(incrementType.getValidTimeType() == 1){
+            incrementOrderMg.setMemberLevels("SE");
+        }
         incrementOrderMg.setMonthQy(param.getMonthQy());
         incrementOrderMg.setTimeZoneOff(0);
         incrementOrderMg.setCustomerName(param.getCustomerName());

src/main/java/com/fdkankan/manage/service/impl/IncrementOrderServiceImpl.java

@@ -6,10 +6,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.common.CacheUtil;
+import com.fdkankan.manage.entity.Camera;
 import com.fdkankan.manage.entity.IncrementOrder;
+import com.fdkankan.manage.entity.UserIncrement;
 import com.fdkankan.manage.mapper.IIncrementOrderMapper;
+import com.fdkankan.manage.service.ICameraService;
 import com.fdkankan.manage.service.IExcelService;
 import com.fdkankan.manage.service.IIncrementOrderService;
+import com.fdkankan.manage.service.IUserIncrementService;
 import com.fdkankan.manage.util.Dateutils;
 import com.fdkankan.manage.vo.request.OrderParam;
 import com.fdkankan.manage.vo.response.IncrementOrderVo;
@@ -18,6 +22,7 @@ import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * <p>
@@ -32,6 +37,10 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
 
     @Autowired
     IExcelService excelService;
+    @Autowired
+    IUserIncrementService userIncrementService;
+    @Autowired
+    ICameraService cameraService;
 
     @Override
     public PageInfo pageList(OrderParam param) {
@@ -43,6 +52,16 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
                 tradeTime = Dateutils.AddMinute(record.getTradeTime(),record.getTimeZoneOff());
             }
             record.setCreateTime(tradeTime);
+            List<UserIncrement> userIncrements = userIncrementService.getByOrderSn(record.getOrderSn());
+            if(userIncrements!=null && userIncrements.size() >0){
+                UserIncrement userIncrement = userIncrements.get(0);
+                record.setIncrementStartTime(Dateutils.getDate(userIncrement.getIncrementStartTime()));
+                record.setIncrementEndTime(Dateutils.getDate(userIncrement.getIncrementEndTime()));
+                Camera camera = cameraService.getById(userIncrement.getCameraId());
+                if(camera!=null){
+                    record.setSnCode(camera.getSnCode());
+                }
+            }
         }
         return PageInfo.PageInfo(page);
     }

src/main/java/com/fdkankan/manage/service/impl/UserIncrementServiceImpl.java

@@ -154,7 +154,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         if(incrementType == null){
             throw new BusinessException(ResultCode.INCREMENT_TYPE_EMPTY);
         }
-        iIncrementOrderMgService.addOrder(param);
+        iIncrementOrderMgService.addOrder(param,incrementType);
 
         for (int i = 0 ; i<param.getCount() ;i++) {
             UserIncrement userIncrement = new UserIncrement();
@@ -231,4 +231,11 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         wrapper.set(UserIncrement::getAgentId,null);
         this.update(wrapper);
     }
+
+    @Override
+    public List<UserIncrement> getByOrderSn(String orderSn) {
+        LambdaQueryWrapper<UserIncrement> wrapper = new LambdaQueryWrapper<>();
+        wrapper.like(UserIncrement::getOrderSn,orderSn);
+        return this.list(wrapper);
+    }
 }

src/main/java/com/fdkankan/manage/vo/response/IncrementOrderVo.java

@@ -2,10 +2,12 @@ package com.fdkankan.manage.vo.response;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.fdkankan.manage.util.Dateutils;
 import jdk.nashorn.internal.ir.annotations.Ignore;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 @Data
 public class IncrementOrderVo {
@@ -42,9 +44,61 @@ public class IncrementOrderVo {
     @ExcelProperty("付款状态")
     private String payStatus;           //付款状态（状态，0或-1表示未付款，-2表示已退款,1表示已付款
 
+    @ExcelIgnore
     private Integer timeZoneOff;
 
+    @ExcelProperty("权益类型")
+    private String memberLevels;
+
+    @ExcelProperty("客户名称")
+    private String customerName;
+
+    /**
+     * 客户类别0直销，1经销
+     */
+    @ExcelIgnore
+    private Integer customerType;
+
+    @ExcelProperty("客户类别")
+    private String customerTypeStr;
+
+    @ExcelProperty("终端客户")
+    private String endCustomer;
+
+    @ExcelIgnore
+    private Integer useType;
+
+    @ExcelProperty("使用类型")
+    private String useTypeStr;
+
+    @ExcelProperty("经销商名称")
+    private String agentName;
+
+    @ExcelProperty("项目号")
+    private String projectNum;
+
+    @ExcelProperty("冲值方式")
+    private String payMethod;
+
+    @ExcelProperty("备注")
+    private String remark;
+
+    @ExcelIgnore
+    private Date incrementStartTime;
+
+    @ExcelIgnore
+    private Date incrementEndTime;
+
+    @ExcelProperty("会员服务期限")
+    private String incrementTime;
+
+    @ExcelProperty("SN码")
+    private String snCode;
+
     public String getPayType() {
+        if(payType == null){
+            return "";
+        }
         switch (payType){
             case "0" : return "微信";
             case "1" : return "支付宝";
@@ -57,6 +111,9 @@ public class IncrementOrderVo {
 
 
     public String getPayStatus() {
+        if(payStatus == null){
+            return "";
+        }
         switch (payStatus){
             case "-1" :
             case "0" :
@@ -66,4 +123,37 @@ public class IncrementOrderVo {
             default: return "";
         }
     }
+
+    public String getCustomerTypeStr() {
+        if(customerType == null){
+            return "";
+        }
+        switch (customerType){
+            case 0 : return "直销";
+            case 1 : return "经销";
+            default: return "";
+        }
+    }
+
+    public String getUseTypeStr() {
+        if(useType == null){
+            return "";
+        }
+        switch (useType){
+            case 1 : return "项目实施";
+            case 2 : return "客户试用";
+            case 3 : return "内部测试";
+            case 4 : return "正常销售";
+            case 5 : return "渠道推广";
+            case 6 : return "其它";
+            default: return "";
+        }
+    }
+
+    public String getIncrementTime() {
+        if(incrementStartTime==null || incrementEndTime == null){
+            return "";
+        }
+        return Dateutils.getDayDate(incrementStartTime) +"~" + Dateutils.getDayDate(incrementEndTime);
+    }
 }

src/main/resources/mapper/manage/IncrementOrderMapper.xml

@@ -3,9 +3,23 @@
 <mapper namespace="com.fdkankan.manage.mapper.IIncrementOrderMapper">
 
     <select id="pageList" resultType="com.fdkankan.manage.vo.response.IncrementOrderVo">
-        select o.* ,u.user_name,u.nick_name from  t_increment_order o
+        select o.* ,u.user_name,u.nick_name,
+               null as customer_name,null as customer_type,null as end_customer,null as use_type ,null as project_num ,null as remark,
+               '线上' as payMethod
+        from  t_increment_order o
         left join t_user u on o.user_id = u.id
         WHERE o.rec_status = 'A' and o.pay_status = '1'
+        <include refid="commonWhere"></include>
+        union all
+        SELECT o.*,u.user_name,u.nick_name ,'线下'as payMethod from t_increment_order_mg o
+        left join t_user u on o.user_id = u.id
+        WHERE o.rec_status = 'A' and o.pay_status = '1'
+        <include refid="commonWhere"></include>
+
+        order by create_time desc
+    </select>
+
+    <sql id="commonWhere">
         <if test="param.orderSn !=null and param.orderSn !='' ">
             and o.order_sn like concat ('%',#{param.orderSn},'%')
         </if>
@@ -21,6 +35,5 @@
         <if test="param.endTime != null and param.endTime !='' ">
             and o.trade_time &lt;= #{param.endTime}
         </if>
-        order by o.create_time desc
-    </select>
+    </sql>
 </mapper>