后端代码提交

src/main/java/com/jkcredit/invoice/controller/localBussiness/CustomerController.java

@@ -129,7 +129,7 @@ public class CustomerController {
     @ApiOperation(value="手工添加备案信息", notes="手工添加备案信息")
     @LoginRequired
     public RespR customerRecAdd(@RequestBody  CustomerRec customerRec) {
-        customerRec.setInterType(3);
+        customerRec.setInterType(1);
         List<CustomerRec> customerRecList = new ArrayList<>();
         customerRecList.add(customerRec);
         return lowerService.customeRec(customerRecList);

src/main/java/com/jkcredit/invoice/controller/localBussiness/SelfCarController.java

@@ -119,6 +119,7 @@ public class SelfCarController {
     @LoginRequired
     public RespR findSelfcarCalculateInfo(Page page, SelfCarCalculateInfor carCalculateInfor) {
         try {
+
             RespR respR = new RespR(selfCarCalculateInfoService.findByPageAndCalculateInfor(page, carCalculateInfor));
             return respR;
         }catch (Exception e){
@@ -126,4 +127,28 @@ public class SelfCarController {
             return new RespR(false,e.getMessage());
         }
     }
+    /**
+     * 分页查询自有车计费信息
+     *
+     * @param carCalculateInfor
+     * @return 用户集合
+     */
+    @PostMapping("/findSelfcarCalculateInfoSta")
+    @ApiOperation(value="自有车计费统计信息", notes="自有车计费统计信息")
+    @LoginRequired
+    public RespR findSelfcarCalculateInfoSta(SelfCarCalculateInfor carCalculateInfor) {
+        try {
+            if(!StringUtils.isEmpty(carCalculateInfor.getCalTime()) && !"null".equals(carCalculateInfor.getCalTime())){
+                String [] res =carCalculateInfor.getCalTime().split(",");
+                carCalculateInfor.setCalTimeStart(res[0]);
+                carCalculateInfor.setCalTimeEnd(res[1]);
+            }
+            RespR respR = new RespR(selfCarCalculateInfoService.findSelfcarCalculateInfoSta(carCalculateInfor));
+            return respR;
+        }catch (Exception e){
+            e.printStackTrace();
+            return new RespR(false,e.getMessage());
+        }
+    }
+
 }

src/main/java/com/jkcredit/invoice/mapper/calculateInfor/SelfCarCalculateInforMapper.java

@@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 @Repository
 public interface SelfCarCalculateInforMapper extends BaseMapper<SelfCarCalculateInfor> {
@@ -17,4 +18,7 @@ public interface SelfCarCalculateInforMapper extends BaseMapper<SelfCarCalculate
     int insert(SelfCarCalculateInfor record);
 
     SelfCarCalculateInfor selectByEtcAndTime(SelfCarCalculateInfor selfCarCalculateInfor);
+
+    List<Map<String,String>> findSelfcarCalculateInfoSta(SelfCarCalculateInfor selfCarCalculateInfor);
+
 }

src/main/java/com/jkcredit/invoice/model/entity/Calculate/NoCarCalculateInfor.java

@@ -43,7 +43,7 @@ public class NoCarCalculateInfor {
     /**
      * 计费费用
      */
-    private Long fee;
+    private Double fee;
     /**
      * 计费时间
      */
@@ -71,11 +71,11 @@ public class NoCarCalculateInfor {
         this.tradeId = tradeId;
     }
 
-    public Long getFee() {
+    public Double getFee() {
         return fee;
     }
 
-    public void setFee(Long fee) {
+    public void setFee(Double fee) {
         this.fee = fee;
     }
 

src/main/java/com/jkcredit/invoice/model/entity/Calculate/SelfCarCalculateInfor.java

@@ -11,6 +11,11 @@ public class SelfCarCalculateInfor {
     private String customId;
 
     /**
+     * 税号
+     */
+    private String companyReferencenum;
+
+    /**
      * 公司编号
      */
     private String companyNum;
@@ -21,13 +26,16 @@ public class SelfCarCalculateInfor {
     /**
      * 计费费用
      */
-    private Long fee;
+    private Double fee;
 
     /**
      * 计费年月
      */
     private String calTime;
 
+    private String calTimeStart;
+
+    private String calTimeEnd;
     /**
      * 开票时间
      */
@@ -66,11 +74,11 @@ public class SelfCarCalculateInfor {
         this.etcNum = etcNum;
     }
 
-    public Long getFee() {
+    public Double getFee() {
         return fee;
     }
 
-    public void setFee(Long fee) {
+    public void setFee(Double fee) {
         this.fee = fee;
     }
 
@@ -89,4 +97,28 @@ public class SelfCarCalculateInfor {
     public void setInvoiceMkTime(String invoiceMkTime) {
         this.invoiceMkTime = invoiceMkTime;
     }
+
+    public String getCompanyReferencenum() {
+        return companyReferencenum;
+    }
+
+    public void setCompanyReferencenum(String companyReferencenum) {
+        this.companyReferencenum = companyReferencenum;
+    }
+
+    public String getCalTimeStart() {
+        return calTimeStart;
+    }
+
+    public void setCalTimeStart(String calTimeStart) {
+        this.calTimeStart = calTimeStart;
+    }
+
+    public String getCalTimeEnd() {
+        return calTimeEnd;
+    }
+
+    public void setCalTimeEnd(String calTimeEnd) {
+        this.calTimeEnd = calTimeEnd;
+    }
 }

src/main/java/com/jkcredit/invoice/model/entity/customer/Customer.java

@@ -4,7 +4,7 @@ public class Customer {
     /**
      * etc收费费用
      */
-    private long fee =5000;//todo 先写死
+    private Double fee =5d;
     private String customerName;
 
     private String invoiceTime;
@@ -16,7 +16,9 @@ public class Customer {
     private Integer usenumPlat;
 
     private Double accountBalance =0d;
-
+    /**
+     * 2.无车 0.自有车
+     */
     private Integer bussinessType;
 
     private Integer integrationType=0;
@@ -119,11 +121,11 @@ public class Customer {
         return company;
     }
 
-    public long getFee() {
+    public Double getFee() {
         return fee;
     }
 
-    public void setFee(long fee) {
+    public void setFee(Double fee) {
         this.fee = fee;
     }
 

src/main/java/com/jkcredit/invoice/model/entity/customer/CustomerCarRec.java

@@ -9,9 +9,10 @@ public class CustomerCarRec {
     private String businessType;
 
     private String carNum;
-
+    /**车辆颜色 蓝牌车需要 填运营类型**/
     private String carColor;
-
+    //运营类型,当为蓝牌车时为必填选项
+    private Integer serviceOperation;
     private String custPhone;
 
     private String etcNum;
@@ -131,4 +132,12 @@ public class CustomerCarRec {
     public void setValidateCode(String validateCode) {
         this.validateCode = validateCode;
     }
+
+    public Integer getServiceOperation() {
+        return serviceOperation;
+    }
+
+    public void setServiceOperation(Integer serviceOperation) {
+        this.serviceOperation = serviceOperation;
+    }
 }

src/main/java/com/jkcredit/invoice/model/entity/customer/CustomerRec.java

@@ -78,7 +78,7 @@ public class CustomerRec {
      */
     private Integer recStatus;
 
-    private Integer interType; //0-接口 1-平台 3.手工录入
+    private Integer interType =1; //0-接口 1-平台 3.手工录入
 
     /**
      * 业务类型 0 -自有车 1-外协车 2-无车

src/main/java/com/jkcredit/invoice/model/entity/user/User.java

@@ -84,4 +84,10 @@ public class User implements Serializable {
      */
     @ApiModelProperty(value = "锁定状态")
     private Integer isLock;
+
+    /**
+     * etc卡每月收费，这个不入库
+     */
+    @ApiModelProperty(value = "etc收费")
+    private Double fee;
 }

src/main/java/com/jkcredit/invoice/service/CalculateInfor/SelfCarCalculateInfoService.java

@@ -6,6 +6,7 @@ import com.jkcredit.invoice.model.entity.Calculate.NoCarCalculateInfor;
 import com.jkcredit.invoice.model.entity.Calculate.SelfCarCalculateInfor;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 自有车计费服务
@@ -18,4 +19,6 @@ public interface SelfCarCalculateInfoService {
      * @return
      */
     IPage<List<SelfCarCalculateInfor>> findByPageAndCalculateInfor(Page page, SelfCarCalculateInfor calculateInfor);
+
+    List<Map<String,String>> findSelfcarCalculateInfoSta(SelfCarCalculateInfor calculateInfor);
 }

src/main/java/com/jkcredit/invoice/service/CalculateInfor/impl/SelfcarCalculateInfoServiceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class SelfcarCalculateInfoServiceImpl extends ServiceImpl<SelfCarCalculateInforMapper,SelfCarCalculateInfor> implements SelfCarCalculateInfoService {
@@ -21,4 +22,17 @@ public class SelfcarCalculateInfoServiceImpl extends ServiceImpl<SelfCarCalculat
     public IPage<List<SelfCarCalculateInfor>> findByPageAndCalculateInfor(Page page, SelfCarCalculateInfor calculateInfor) {
         return CarCalculateInforMapper.selectAllByPage(page,calculateInfor);
     }
+
+    @Override
+    public List<Map<String, String>> findSelfcarCalculateInfoSta(SelfCarCalculateInfor calculateInfor) {
+       //1.按企业统计出计费信息条数
+
+        //2.按企业统计etc卡数量
+
+        //3.通过计费的etc卡数查询对应的交易id数
+
+
+
+        return CarCalculateInforMapper.findSelfcarCalculateInfoSta(calculateInfor);
+    }
 }

src/main/java/com/jkcredit/invoice/service/lowerService/impl/CustomerLowerServiceImpl.java

@@ -53,7 +53,11 @@ public class CustomerLowerServiceImpl implements CustomeLowerService {
         customerRecs.stream().forEach(customerRec -> {
             Customer customer = customerMapper.selectByCustomerName(customerRec.getCustomerName());
             if(customer == null || customer.getAccstatus()!=0){
-                res.append(customerRec.getCustomerName()+"不存在或已经停用;");
+                res.append("#"+customerRec.getCustomerName()+"不存在或已经停用;#");
+                return;
+            }
+            if(!customer.getBussinessType().equals(customerRec.getBussinessType())){
+                res.append("#"+customerRec.getCompanyName()+"业务类型有误;#");
                 return;
             }
             //默认备案状态为备案中 2-失败 1-成功 3-等待协议上传 4-停用 0-备案中
@@ -66,11 +70,13 @@ public class CustomerLowerServiceImpl implements CustomeLowerService {
                    customerRec.setCompanyNum(b2bCompanyModels.get(0).getCompanyNum());
                    customerRec.setRecStatus(1);
                }
+            }else{
+                res.append("#企业:"+customerRec.getCompanyName()+"备案失败:"+respR.getMsg()+"#");
             }
             //客户备案信息入表
             CustomerRec customerRec1 = customerRecMapper.selectByCustomerNameAndCompany(customerRec);
             customerRec.setCreatetime(DateUtil.getCurrentDateStr());
-            customerRec.setCompanyBelongName(customerRec.getCompanyName());
+            customerRec.setCompanyBelongName(customer.getCompany());
             if(customerRec1 == null){
                 customerRecMapper.insert(customerRec);
             }else{

src/main/java/com/jkcredit/invoice/service/lowerService/impl/NoCarServiceImpl.java

@@ -15,12 +15,15 @@ import com.jkcredit.invoice.model.entity.customer.Customer;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
 import com.jkcredit.invoice.model.entity.customer.CustomerRec;
 import com.jkcredit.invoice.model.entity.invoice.BillInvoice;
+import com.jkcredit.invoice.model.entity.manager.Param;
 import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
 import com.jkcredit.invoice.service.lowerService.NoCarService;
 import com.jkcredit.invoice.service.lowerService.vo.HCInvoiceQueryVo;
 import com.jkcredit.invoice.service.lowerService.vo.MonthAccountQueryVo;
+import com.jkcredit.invoice.service.manager.ParamService;
 import com.jkcredit.invoice.service.upService.NoCarInterface;
 import com.jkcredit.invoice.util.DateUtil;
+import com.jkcredit.invoice.util.MathUtil;
 import com.jkcredit.invoice.util.RespR;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,7 +57,8 @@ public class NoCarServiceImpl implements NoCarService{
     @Autowired
     NoCarCalculateInforMapper calculateInforMapper;
 
-
+    @Autowired
+    ParamService paramService;
 
     @Override
     public RespR customerCarRec(List<CustomerCarRec> customerCarRecs) {
@@ -88,6 +92,13 @@ public class NoCarServiceImpl implements NoCarService{
                 }
                 //如果业务类型是无车
                 VehicleRegisterRequest vehicleRegisterRequest = new VehicleRegisterRequest();
+                if("0".equals(customerCarRec.getCarColor())){
+                    if(customerCarRec.getServiceOperation() == null){
+                        res.append("#客户："+customerCarRec.getCustomerName()+"企业:"+customerCarRec.getCompanyName()+"车辆:"+customerCarRec.getCarNum()+"为蓝牌车，请传入入运营类型");
+                        continue;
+                    }
+                    vehicleRegisterRequest.setServiceOperation(customerCarRec.getServiceOperation());
+                }
                 vehicleRegisterRequest.setCompanyName(customerCarRec.getCompanyName());
                 vehicleRegisterRequest.setCompanyNum(customerRec.getCompanyNum());
                 vehicleRegisterRequest.setPlateColor(Integer.parseInt(customerCarRec.getCarColor()));
@@ -378,14 +389,15 @@ public class NoCarServiceImpl implements NoCarService{
                     calculateInfor.setBuyerName(invoiceProcessingListModel.getBuyerName());
                     calculateInfor.setBuyerTaxpayerCode(invoiceProcessingListModel.getBuyerTaxpayerCode());
                     calculateInfor.setInvoiceMakeTime(invoiceProcessingListModel.getInvoiceMakeTime());
-                    /**
-                     * 这个设置为动态的 TODO
-                     */
-                    calculateInfor.setFee(1500L);
+                    Param param = paramService.getParamsByParamName("CUST_NOCAR_FEE");
+                    Double fee = Double.parseDouble(param.getParamValue());
+                    calculateInfor.setFee(fee);
                     calculateInfor.setTradeId(billInvoice.getTransactionId());
                     //先查询数据库中有没有这个交易id
                     if(calculateInforMapper.selectByTradeId(billInvoice.getTransactionId())==null){
-                        //todo 扣除客户费用
+                        Customer customer = customerMapper.selectByCustomerName(noCarWayBill.getCustomerName());
+                        customer.setAccountBalance(MathUtil.sub(customer.getAccountBalance(),calculateInfor.getFee()));
+                        customerMapper.updateByPrimaryKeySelective(customer);
                         calculateInforMapper.insert(calculateInfor);
                     }
 

src/main/java/com/jkcredit/invoice/service/lowerService/impl/SelfCarServiceLImpl.java

@@ -24,6 +24,7 @@ import com.jkcredit.invoice.service.lowerService.SelfCarServiceL;
 import com.jkcredit.invoice.service.lowerService.vo.*;
 import com.jkcredit.invoice.service.upService.SelfCarInterface;
 import com.jkcredit.invoice.util.DateUtil;
+import com.jkcredit.invoice.util.MathUtil;
 import com.jkcredit.invoice.util.RespR;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -213,11 +214,14 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
                 //计费
                 SelfCarCalculateInfor carCalculateInfor = new SelfCarCalculateInfor();
                 carCalculateInfor.setCustomId(customerRec.getCustomerName());
-                carCalculateInfor.setCompanyNum(customerRec.getCompanyName());
+                carCalculateInfor.setCompanyNum(customerRec.getCompanyNum());
                 carCalculateInfor.setCalTime(StringUtils.substring(b2BInvoiceQueryByApplyModel.getExTime(),0,7));
                 carCalculateInfor.setFee(customer.getFee());
+                carCalculateInfor.setCompanyReferencenum(customerRec.getCompanyReferencenum());
                 carCalculateInfor.setEtcNum(b2BInvoiceQueryByApplyModel.getCardId());
                 if(calculateInforMapper.selectByEtcAndTime(carCalculateInfor) == null){
+                    customer.setAccountBalance(MathUtil.sub(customer.getAccountBalance(),carCalculateInfor.getFee()));
+                    customerMapper.updateByPrimaryKeySelective(customer);
                     calculateInforMapper.insert(carCalculateInfor);
                 }
             }
@@ -269,12 +273,14 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
                     //计费
                     SelfCarCalculateInfor carCalculateInfor = new SelfCarCalculateInfor();
                     carCalculateInfor.setCustomId(customerRec.getCustomerName());
-                    carCalculateInfor.setCompanyNum(customerRec.getCompanyName());
+                    carCalculateInfor.setCompanyNum(customerRec.getCompanyNum());
                     carCalculateInfor.setCalTime(StringUtils.substring(b2BInvoiceListModel.getExTime(),0,7));
                     carCalculateInfor.setFee(customer.getFee());
                     carCalculateInfor.setEtcNum(b2BInvoiceListModel.getCardId());
+                    carCalculateInfor.setCompanyReferencenum(customerRec.getCompanyReferencenum());
                     if(calculateInforMapper.selectByEtcAndTime(carCalculateInfor) == null){
-                        //todo 扣减客户金额
+                        customer.setAccountBalance(MathUtil.sub(customer.getAccountBalance(),carCalculateInfor.getFee()));
+                        customerMapper.updateByPrimaryKeySelective(customer);
                         calculateInforMapper.insert(carCalculateInfor);
                     }
                     selfCarInvoices.add(selfCarInvoice);

src/main/java/com/jkcredit/invoice/service/user/impl/UserServiceImpl.java

@@ -3,9 +3,12 @@ package com.jkcredit.invoice.service.user.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jkcredit.invoice.mapper.customer.CustomerMapper;
+import com.jkcredit.invoice.model.entity.customer.Customer;
 import com.jkcredit.invoice.model.entity.user.Role;
 import com.jkcredit.invoice.model.entity.user.User;
 import com.jkcredit.invoice.mapper.user.UserMapper;
+import com.jkcredit.invoice.service.customer.CustomerService;
 import com.jkcredit.invoice.service.user.RoleService;
 import com.jkcredit.invoice.service.user.UserService;
 import com.jkcredit.invoice.util.RespR;
@@ -28,6 +31,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     @Autowired
     private RoleService roleService;
 
+    @Autowired
+    CustomerService customerService;
+
+    @Autowired
+    CustomerMapper customerMapper;
+
     @Override
     public IPage getUserWithRolePage(Page page, User user) {
         return baseMapper.getUsersPage(page, user);
@@ -62,7 +71,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
     @Override
     public User selectUserById(Integer id) {
-        return baseMapper.getUserById(id);
+        User user = baseMapper.getUserById(id);
+        Customer customer = customerMapper.selectByCustomerName(user.getUserName());
+        user.setFee(customer.getAccountBalance());
+        return user;
     }
 
     @Override
@@ -79,6 +91,16 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         user.setRoleName(role.getRoleName());
         //设置创建时间
         user.setCreateTime(System.currentTimeMillis());
+        //如果是自有车或无车需要新增客户信息
+        if(!"1".equals(user.getRoleId())){
+            Customer customer = new Customer();
+            customer.setCustomerName(user.getUserName());
+            customer.setCompany(user.getCompany());
+            customer.setFee(user.getFee());
+            customer.setBussinessType(Integer.valueOf(user.getRoleId()));
+            customer.setAccstatus(0);
+            customerService.addCustomers(customer);
+        }
         this.save(user);
         return Boolean.TRUE;
     }

src/main/java/com/jkcredit/invoice/util/MathUtil.java

@@ -9,4 +9,10 @@ public class MathUtil {
         BigDecimal b1 = new BigDecimal(b);
         return a1.add(b1).doubleValue();
     }
+
+    public static double sub(Double a,Double b){
+        BigDecimal a1 = new BigDecimal(a);
+        BigDecimal b1 = new BigDecimal(b);
+        return a1.subtract(b1).doubleValue();
+    }
 }

src/main/resources/mapper/calculateInfor/NoCarCalculateInforMapper.xml

@@ -67,7 +67,7 @@
         invoiceMakeTime
         )
         values ( #{customId,jdbcType=VARCHAR}, #{companyNum,jdbcType=VARCHAR},
-        #{tradeId,jdbcType=VARCHAR}, #{fee,jdbcType=INTEGER},#{calculateTime,jdbcType=VARCHAR},#{ctype,jdbcType=INTEGER}
+        #{tradeId,jdbcType=VARCHAR}, #{fee,jdbcType=DOUBLE},#{calculateTime,jdbcType=VARCHAR},#{ctype,jdbcType=INTEGER}
         ,#{buyerName,jdbcType=VARCHAR},#{buyerTaxpayerCode,jdbcType=VARCHAR},#{invoiceMakeTime,jdbcType=VARCHAR}
         )
     </insert>

src/main/resources/mapper/calculateInfor/SefCarCalculateInforMapper.xml

@@ -11,6 +11,7 @@
         <result column="calculateTime" property="calculateTime"/>
         <result column="ctype" property="ctype"/>
         <result column="invoiceMkTime" property="invoiceMkTime"/>
+        <result column="companyReferencenum" property="companyReferencenum"/>
     </resultMap>
 
     <sql id="baseSql">
@@ -20,7 +21,8 @@
         etcNum,
         fee,
         calTime,
-        invoiceMkTime
+        invoiceMkTime,
+        companyReferencenum
     </sql>
     <select id="selectAllByPage" resultMap="BaseResultMap">
         select
@@ -38,10 +40,79 @@
         companyNum,
         etcNum,
         fee,
-        calTime,invoiceMkTime
+        calTime,invoiceMkTime,companyReferencenum
         )
         values ( #{customId,jdbcType=VARCHAR}, #{companyNum,jdbcType=VARCHAR},
-        #{etcNum,jdbcType=VARCHAR}, #{fee,jdbcType=INTEGER},#{calTime,jdbcType=VARCHAR},#{invoiceMkTime,jdbcType=VARCHAR}
+        #{etcNum,jdbcType=VARCHAR}, #{fee,jdbcType=DOUBLE},#{calTime,jdbcType=VARCHAR},#{invoiceMkTime,jdbcType=VARCHAR},#{companyReferencenum,jdbcType=VARCHAR}
         )
     </insert>
+    <resultMap id="staticResultMap" type="java.util.Map">
+        <result column="customId" property="customId"/>
+        <result column="companyNum" property="companyNum"/>
+        <result column="companyReferencenum" property="companyReferencenum"/>
+        <result column="etcNum" property="etcNum"/>
+        <result column="tradeIdNum" property="tradeIdNum"/>
+        <result column="feeNum" property="feeNum"/>
+    </resultMap>
+    <select id="findSelfcarCalculateInfoSta" resultMap="staticResultMap">
+        select k.*,
+        (
+        select count(1) from (select DISTINCT f.etcNum from t_SelfCalculateInfor f where f.companyNum = companyNum
+
+            <if test="etcNum != null and etcNum != ''">
+                and f.etcNum = #{etcNum}
+            </if>
+            <if test="calTime != null and calTime != ''">
+                and f.calTime BETWEEN #{calTimeStart} and #{calTimeEnd}
+            </if>
+        ) g
+        ) etcNum,
+        (select count(1) from t_SellCarTrade t where t.companyNum = k.companyNum
+        and t.cardId in (select DISTINCT f.etcNum from t_SelfCalculateInfor f where f.companyNum = k.companyNum
+
+            <if test="etcNum != null and etcNum != ''">
+                and f.etcNum = #{etcNum}
+            </if>
+            <if test="calTime != null and calTime != ''">
+                and f.calTime BETWEEN #{calTimeStart} and #{calTimeEnd}
+            </if>
+        )
+        <if test="calTime != null and calTime != ''">
+            and t.exTime BETWEEN #{calTimeStart} and #{calTimeEnd}
+        </if>
+        ) tradeIdNum
+
+        from (
+        select
+        customId,
+        companyNum,
+        companyReferencenum,
+        count(1) feeNum
+        from t_SelfCalculateInfor h
+        <where>
+            <if test="customId != null and customId != ''">
+                and customId LIKE CONCAT('%',#{customId},'%')
+            </if>
+            <if test="companyReferencenum != null and companyReferencenum != ''">
+                and companyReferencenum =#{companyReferencenum}
+            </if>
+            <if test="etcNum != null and etcNum != ''">
+                and etcNum = #{etcNum}
+            </if>
+            <if test="calTime != null and calTime != ''">
+                and calTime BETWEEN #{calTimeStart} and #{calTimeEnd}
+            </if>
+        </where>
+        GROUP by customId,companyNum,companyReferencenum) k
+    </select>
+    <select id="selectEtcNum" resultMap="BaseResultMap">
+        select
+        <include refid="baseSql" />
+        from t_SelfCalculateInfor
+    </select>
+    <select id="selectAllByPage" resultMap="BaseResultMap">
+        select
+        <include refid="baseSql" />
+        from t_SelfCalculateInfor
+    </select>
 </mapper>

src/main/resources/mapper/customer/CustomerMapper.xml

@@ -14,10 +14,11 @@
     <result column="first_sign" property="firstSign" jdbcType="VARCHAR" />
     <result column="accStatus" property="accstatus" jdbcType="INTEGER" />
     <result column="company" property="company" jdbcType="VARCHAR" />
+    <result column="fee" property="fee" jdbcType="DOUBLE" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, customer_name, invoice_time, usenum_all, usenum_interface, usenum_plat, account_balance,
-    bussiness_type, integration_type, first_sign, accStatus, company
+    bussiness_type, integration_type, first_sign, accStatus, company,fee
   </sql>
 
   <select id="selectAllByPage" resultMap="BaseResultMap">
@@ -45,12 +46,12 @@
     insert into t_customer (customer_name, invoice_time,
       usenum_all, usenum_interface, usenum_plat, 
       account_balance, bussiness_type, integration_type, 
-      first_sign, accStatus, company
+      first_sign, accStatus, company,fee
       )
     values ( #{customerName,jdbcType=VARCHAR}, #{invoiceTime,jdbcType=TIMESTAMP},
       #{usenumAll,jdbcType=INTEGER}, #{usenumInterface,jdbcType=INTEGER}, #{usenumPlat,jdbcType=INTEGER}, 
       #{accountBalance,jdbcType=DOUBLE}, #{bussinessType,jdbcType=INTEGER}, #{integrationType,jdbcType=INTEGER}, 
-      #{firstSign,jdbcType=VARCHAR}, #{accstatus,jdbcType=INTEGER}, #{company,jdbcType=VARCHAR}
+      #{firstSign,jdbcType=VARCHAR}, #{accstatus,jdbcType=INTEGER}, #{company,jdbcType=VARCHAR},#{fee,jdbcType=DOUBLE}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.jkcredit.invoice.model.entity.customer.Customer" >
@@ -92,6 +93,9 @@
       <if test="company != null" >
         company,
       </if>
+      <if test="fee != null" >
+        fee,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -130,6 +134,9 @@
       <if test="company != null" >
         #{company,jdbcType=VARCHAR},
       </if>
+      <if test="company != null" >
+        #{fee,jdbcType=DOUBLE},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.jkcredit.invoice.model.entity.customer.Customer" >
@@ -168,6 +175,9 @@
       <if test="company != null" >
         company = #{company,jdbcType=VARCHAR},
       </if>
+      <if test="fee != null" >
+        fee = #{fee,jdbcType=DOUBLE},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -183,7 +193,8 @@
       integration_type = #{integrationType,jdbcType=INTEGER},
       first_sign = #{firstSign,jdbcType=VARCHAR},
       accStatus = #{accstatus,jdbcType=INTEGER},
-      company = #{company,jdbcType=VARCHAR}
+      company = #{company,jdbcType=VARCHAR},
+      fee = #{fee,jdbcType=DOUBLE}
     where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>