后端代码提交

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

@@ -81,7 +81,7 @@ public class CustomerController {
     }
     /**
      * 导出客户信息
-     * @param     customerRec response
+     * @param
      * @return 用户集合
      */
     @GetMapping("/findCustomerRecListExport")

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

@@ -3,12 +3,14 @@ import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import cn.afterturn.easypoi.excel.entity.ImportParams;
 import cn.com.taiji.sdk.model.comm.protocol.tts.invoice.server.B2BInvoiceListModel;
 import cn.com.taiji.sdk.model.comm.protocol.tts.trade.service.CardTradeModel;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jkcredit.invoice.annotation.LoginRequired;
 import com.jkcredit.invoice.model.entity.Calculate.SelfCarCalculateInfor;
 import com.jkcredit.invoice.model.entity.customer.CustomerCarRec;
 import com.jkcredit.invoice.model.entity.invoice.BillInvoice;
 import com.jkcredit.invoice.model.entity.invoice.SelfCarInvoice;
+import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
 import com.jkcredit.invoice.model.entity.waybill.SelfCarTrade;
 import com.jkcredit.invoice.service.CalculateInfor.SelfCarCalculateInfoService;
 import com.jkcredit.invoice.service.lowerService.SelfCarServiceL;
@@ -26,9 +28,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 @Api(tags = "自有车操作")
 @RestController
@@ -81,6 +81,24 @@ public class SelfCarController {
             return new RespR(false,e.getMessage());
         }
     }
+    /**
+     * 分页查询自有车交易信息
+     *
+     * @param selfCarTrades    参数集
+     * @return 交易信息
+     */
+    @PostMapping("/updateTrades")
+    @ApiOperation(value="更新交易id状态", notes="更新交易id状态")
+    @LoginRequired
+    public void updateTrades( String selfCarTradesStr) {
+        try {
+            List<SelfCarTrade>  selfCarTrades = JSON.parseArray(selfCarTradesStr,SelfCarTrade.class);
+            selfCarTradeService.updateTrades(selfCarTrades);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
     public void setTimeDue(SelfCarTrade selfCarTrade){
         if(!StringUtils.isEmpty(selfCarTrade.getAclTimeBegin()) && !"null".equals(selfCarTrade.getAclTimeBegin())){
             String [] res = selfCarTrade.getAclTimeBegin().split(",");
@@ -132,7 +150,11 @@ public class SelfCarController {
     @LoginRequired
     public RespR findSelfcarCalculateInfo(Page page, 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.findByPageAndCalculateInfor(page, carCalculateInfor));
             return respR;
         }catch (Exception e){
@@ -202,13 +224,38 @@ public class SelfCarController {
     @ApiOperation(value="根据车牌号进行开票操作", notes="根据车牌号进行开票操作")
     @LoginRequired
     public RespR applTradeList(@RequestBody TradeRequestCarNumVo tradeRequestCarNumVo){
+        String [] cardAndTrades = tradeRequestCarNumVo.getCarIdStr().split(",");
+        Map<String,InvoiceApplVo> map = new HashMap<>();
+        for(int i = 0;i<cardAndTrades.length;i++){
+            if(!StringUtils.isEmpty(cardAndTrades[i])){
+                String [] cardAndTrade = cardAndTrades[i].split("#");
+                InvoiceApplVo invoiceApplVo = map.get(cardAndTrade[0]);
+                if(invoiceApplVo == null){
+                    invoiceApplVo.setCompanyName(tradeRequestCarNumVo.getCompanyName());
+                    invoiceApplVo.setCustomerName(tradeRequestCarNumVo.getCustomerName());
+                    invoiceApplVo.setCardId(cardAndTrade[0]);
+                    invoiceApplVo.setTradeIds(new ArrayList<String>());
+                    invoiceApplVo.getTradeIds().add(cardAndTrade[1]);
+                    map.put(cardAndTrade[0],invoiceApplVo);
+                }else{
+                    invoiceApplVo.getTradeIds().add(cardAndTrade[1]);
+                }
+            }
+        }
         //通过车牌号查询所有的Etc卡号
-        List<CustomerCarRec> customerCarRecs = selfCarService.getEtcsByCarNum(tradeRequestCarNumVo.getCarNum());
+        /*List<CustomerCarRec> customerCarRecs = selfCarService.getEtcsByCarNum(tradeRequestCarNumVo.getCarNum());
         if(customerCarRecs == null || customerCarRecs.size()<=0){
             return new RespR(false,"请输入有绑定ETC卡号的车牌");
-        }
+        }*/
         StringBuffer stringBuffer = new StringBuffer();
-        customerCarRecs.forEach(customerCarRec -> {
+        for(Map.Entry<String,InvoiceApplVo> elm:map.entrySet()){
+            InvoiceApplVo invoiceApplVo = elm.getValue();
+            RespR respR = selfCarServicel.applInvoice(invoiceApplVo);
+            if(respR.getCode() == 1){
+                stringBuffer.append(invoiceApplVo.getCardId()+"开票申请失败原因:"+respR.getMsg()+"#");
+            }
+        }
+/*        customerCarRecs.forEach(customerCarRec -> {
             TradeRequestVo tradeRequestVo = new TradeRequestVo();
             tradeRequestVo.setCompanyName(tradeRequestCarNumVo.getCompanyName());
             tradeRequestVo.setCustomerName(tradeRequestCarNumVo.getCustomerName());
@@ -238,7 +285,7 @@ public class SelfCarController {
             }else {
                 stringBuffer.append(customerCarRec.getEtcNum()+"开票申请失败原因:"+respRbefore.getMsg()+"#");
             }
-        });
+        });*/
         if(StringUtils.isEmpty(stringBuffer.toString())){
             return new RespR(true);
         }else{

src/main/java/com/jkcredit/invoice/credit/SimpleCORSFilter.java

@@ -145,7 +145,7 @@ public class SimpleCORSFilter implements Filter {
             "/selfCar/findSelfcarInvoiceByTime",
             "/selfCar/batchImportSelfcarInvoices",
             "/selfCar/batchImportSelfcarTrades",
-
+            "/selfCar/updateTrades",
 
             "/param",
             "/param/page",

src/main/java/com/jkcredit/invoice/model/entity/waybill/NoCarWayBill.java

@@ -163,6 +163,11 @@ public class NoCarWayBill implements Cloneable{
 
     private String days;
 
+    /**
+     * 1 - 成功 2-失败
+     */
+    private String success;
+
     public Long getId() {
         return id;
     }
@@ -443,6 +448,14 @@ public class NoCarWayBill implements Cloneable{
         this.days = days;
     }
 
+    public String getSuccess() {
+        return success;
+    }
+
+    public void setSuccess(String success) {
+        this.success = success;
+    }
+
     @Override
     public NoCarWayBill clone() throws CloneNotSupportedException {
         return (NoCarWayBill)super.clone();

src/main/java/com/jkcredit/invoice/model/entity/waybill/SelfCarTrade.java

@@ -77,6 +77,8 @@ public class SelfCarTrade {
      */
     private String exceptionFlag;
 
+    private String days;
+
 
     private Integer interType =1; //0-接口 1-平台
 
@@ -224,6 +226,14 @@ public class SelfCarTrade {
         this.exceptionFlag = exceptionFlag;
     }
 
+    public String getDays() {
+        return days;
+    }
+
+    public void setDays(String days) {
+        this.days = days;
+    }
+
     @Override
     public String toString() {
         return "SelfCarTrade{" +

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

@@ -217,6 +217,10 @@ public class NoCarServiceImpl implements NoCarService{
         if(DateUtil.getDistanceHours(noCarWayBill.getStartTime(),new Date())<-72){
             return new RespR(false,"已经超过72小时，请20天后上传历史运单");
         }
+        if(DateUtil.getDistanceHours(noCarWayBill.getStartTime(),DateUtil.StringToDate(noCarWayBill.getPredictEndTime()))<-96){
+            log.info("运单结束失败：NoCarServiceImpl.noCarWaybillStart{},msg{}",noCarWayBill,"运单已经超时，请拆分");
+            return new RespR(false,"运单开始时间与结束时间超过96小时，请拆分");
+        }
         RespR respR = checkCarWayBillAndSetInfo(noCarWayBill);
         if(respR.getCode() == 1){
             log.info("运单上传失败：NoCarServiceImpl.noCarWaybillStart{}，msg{}",noCarWayBill,respR.getMsg());
@@ -301,10 +305,10 @@ public class NoCarServiceImpl implements NoCarService{
         if(noCarWayBill1 == null || noCarWayBill1.getBillwayStatus() !=1 || noCarWayBill.getHisFlag() ==1 ){
             log.info("运单结束失败：NoCarServiceImpl.noCarWaybillEnd{},msg{}",noCarWayBill,"当前运单状态无法结束,请检查当前指令状态");
             if(noCarWayBill1 == null){
-                noCarWayBill1.setBillwayStatus(-2);
+                noCarWayBill.setBillwayStatus(-2);
             }
-            noCarWayBill1.setFailReason("当前运单状态无法结束,请检查当前指令状态");
-            insertOrUpdateBill(noCarWayBill1);
+            noCarWayBill.setFailReason("当前运单状态无法结束,请检查当前指令状态");
+            insertOrUpdateBill(noCarWayBill);
             return new RespR(false,"当前运单状态无法结束");
         }
         noCarWayBill1.setDestAddr(noCarWayBill.getDestAddr());
@@ -357,6 +361,10 @@ public class NoCarServiceImpl implements NoCarService{
             log.info("历史运单开始上传失败：NoCarServiceImpl.noCarHisWaybillStart{},msg{}",noCarWayBill,"必须是二十天前的运单");
             return new RespR(false,"必须是二十天前的运单");
         }
+        if(DateUtil.getDistanceHours(noCarWayBill.getStartTime(),DateUtil.StringToDate(noCarWayBill.getPredictEndTime()))<-96){
+            log.info("运单结束失败：NoCarServiceImpl.noCarWaybillStart{},msg{}",noCarWayBill,"运单已经超时，请拆分");
+            return new RespR(false,"运单开始时间与结束时间超过96小时，请拆分");
+        }
         RespR respR = checkCarWayBillAndSetInfo(noCarWayBill);
         if(respR.getCode() == 1){
             log.info("历史运单开始上传失败：NoCarServiceImpl.noCarHisWaybillStart{},msg{}",noCarWayBill,respR.getMsg());

src/main/java/com/jkcredit/invoice/service/lowerService/vo/TradeRequestCarNumVo.java

@@ -8,6 +8,8 @@ public class TradeRequestCarNumVo {
     private String carNum;
     private Integer tradeStatus;
 
+    private String carIdStr;
+
     public String getStartTime() {
         return startTime;
     }
@@ -56,6 +58,14 @@ public class TradeRequestCarNumVo {
         this.tradeStatus = tradeStatus;
     }
 
+    public String getCarIdStr() {
+        return carIdStr;
+    }
+
+    public void setCarIdStr(String carIdStr) {
+        this.carIdStr = carIdStr;
+    }
+
     @Override
     public String toString() {
         return "TradeRequestCarNumVo{" +
@@ -65,6 +75,7 @@ public class TradeRequestCarNumVo {
                 ", customerName='" + customerName + '\'' +
                 ", carNum='" + carNum + '\'' +
                 ", tradeStatus=" + tradeStatus +
+                ", carIdStr='" + carIdStr + '\'' +
                 '}';
     }
 }

src/main/java/com/jkcredit/invoice/service/nocar/impl/NoCarBillWayServiceImpl.java

@@ -252,7 +252,9 @@ public class NoCarBillWayServiceImpl extends ServiceImpl<NoCarWaybillMapper,NoCa
 
         noCarWayBills.parallelStream().forEach(noCarWayBill -> {
             try {
+                noCarWayBill.setBatchNum(batchNumber);
                 noCarWayBill.setBatchNumEnd(batchNumber);
+                noCarWayBill.setHisFlag(0);
                 noCarWaybillMapperImprt.insertImport(noCarWayBill);
                 RespR respR = noCarService.noCarWaybillEnd(noCarWayBill);
                 if (respR.getCode() == 1){

src/main/java/com/jkcredit/invoice/service/selfCar/SelfCarTradeService.java

@@ -21,4 +21,6 @@ public interface SelfCarTradeService {
     IPage<List<SelfCarTrade>> findByPageAndTrade(Page page, SelfCarTrade selfCarTrade);
 
     RespR batchImportSelfcarTrades(List<SelfCarTrade> list);
+
+    boolean updateTrades(List<SelfCarTrade> selfCarTrades);
 }

src/main/java/com/jkcredit/invoice/service/selfCar/impl/SelfCarTradeServiceImpl.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jkcredit.invoice.mapper.waybill.SellCarTradeMapper;
 import com.jkcredit.invoice.model.entity.waybill.SelfCarTrade;
+import com.jkcredit.invoice.service.lowerService.SelfCarServiceL;
+import com.jkcredit.invoice.service.lowerService.vo.TradeRequestVo;
 import com.jkcredit.invoice.service.selfCar.SelfCarTradeService;
 import com.jkcredit.invoice.util.RespR;
 import org.apache.commons.lang3.StringUtils;
@@ -11,11 +13,16 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
 @Service
 public class SelfCarTradeServiceImpl extends ServiceImpl<SellCarTradeMapper,SelfCarTrade> implements SelfCarTradeService{
     @Autowired
     SellCarTradeMapper sellCarTradeMapper;
+    @Autowired
+    SelfCarServiceL selfCarService;
     @Override
     public IPage<List<SelfCarTrade>> findByPageAndTrade(Page page, SelfCarTrade selfCarTrade) {
         return sellCarTradeMapper.selectAllByPage(page,selfCarTrade);
@@ -44,4 +51,35 @@ public class SelfCarTradeServiceImpl extends ServiceImpl<SellCarTradeMapper,Self
         }
         return new RespR<>(selfCarTradeTmp,"1");
     }
+
+    @Override
+    public boolean updateTrades(List<SelfCarTrade> selfCarTrades) {
+        Map<String,TradeRequestVo> map = new HashMap<>();
+        selfCarTrades.forEach(selfCarTrade -> {
+            TradeRequestVo tradeRequestVo = map.get(selfCarTrade.getCardId());
+            if(tradeRequestVo == null){
+                tradeRequestVo = new TradeRequestVo();
+                tradeRequestVo.setEtcId(selfCarTrade.getCardId());
+                tradeRequestVo.setTradeStatus(3);
+                tradeRequestVo.setStartTime(selfCarTrade.getExTime());
+                tradeRequestVo.setCustomerName(selfCarTrade.getCustomId());
+                tradeRequestVo.setCompanyName(selfCarTrade.getCompanyName());
+                tradeRequestVo.setEndTime(selfCarTrade.getExTime());
+                map.put(selfCarTrade.getCardId(),tradeRequestVo);
+            }else{
+                if(selfCarTrade.getExTime().compareTo(tradeRequestVo.getStartTime())<0){
+                    tradeRequestVo.setStartTime(selfCarTrade.getExTime());
+                }
+
+                if(selfCarTrade.getExTime().compareTo(tradeRequestVo.getEndTime())>0){
+                    tradeRequestVo.setEndTime(selfCarTrade.getExTime());
+                }
+            }
+        });
+        for(Map.Entry<String,TradeRequestVo> elm:map.entrySet()){
+            TradeRequestVo tradeRequestVo = elm.getValue();
+            selfCarService.getTradeList(tradeRequestVo);
+        }
+        return true;
+    }
 }

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

@@ -38,7 +38,7 @@
             and etcNum = #{calculateInfor.etcNum}
         </if>
         <if test="calculateInfor.calTime != null and calculateInfor.calTime != ''">
-            and calTime BETWEEN #{calTimeStart} and #{calculateInfor.calTimeEnd}
+            and calTime BETWEEN #{calculateInfor.calTimeStart} and #{calculateInfor.calTimeEnd}
         </if>
     </select>
     <select id="selectByEtcAndTime" resultMap="BaseResultMap" parameterType="com.jkcredit.invoice.model.entity.Calculate.SelfCarCalculateInfor">

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

@@ -29,6 +29,12 @@
             <if test="customerOper.customerName != null and customerOper.customerName != ''">
                 AND  customerName LIKE CONCAT('%',#{customerOper.customerName},'%')
             </if>
+            <if test="customerOper.company != null and customerOper.company != ''">
+                AND  company LIKE CONCAT('%',#{customerOper.company},'%')
+            </if>
+            <if test="customerOper.batchNumber != null and customerOper.batchNumber != ''">
+                AND  batchNumber LIKE CONCAT('%',#{customerOper.batchNumber},'%')
+            </if>
             <if test="customerOper.operType != null and customerOper.operType != ''">
                 AND  operType = #{customerOper.operType}
             </if>

src/main/resources/mapper/waybill/NoCarWaybillImportMapper.xml

@@ -62,6 +62,9 @@
             <if test="noCarWayBill.billNum != null and noCarWayBill.billNum != ''">
                 and billNum = #{noCarWayBill.billNum}
             </if>
+            <if test="noCarWayBill.plateNum != null and noCarWayBill.plateNum != ''">plateNum
+                and plateNum = #{noCarWayBill.plateNum}
+            </if>
             <if test="noCarWayBill.taxplayerCode != null and noCarWayBill.taxplayerCode != ''">
                 and taxplayerCode = #{noCarWayBill.taxplayerCode}
             </if>
@@ -80,6 +83,12 @@
             <if test="noCarWayBill.batchNumEnd != null and noCarWayBill.batchNumEnd != ''">
                 and batchNumEnd = #{noCarWayBill.batchNumEnd}
             </if>
+            <if test="noCarWayBill.success == 1">
+                and billwayStatus in(1,2,3,4)
+            </if>
+            <if test="noCarWayBill.success == 2">
+                and billwayStatus in(-1,-2,-3)
+            </if>
         </where>
     </select>
     <select id="selectAllByPageException" resultMap="BaseResultMap">
@@ -189,7 +198,7 @@
         companyTel = #{companyTel,jdbcType=VARCHAR},
         companyNum = #{companyNum,jdbcType=VARCHAR},
         failReason = #{failReason,jdbcType=VARCHAR}
-        where billNum = #{billNum,jdbcType=VARCHAR}
+        where billNum = #{billNum,jdbcType=VARCHAR} and batchNumber = #{batchNum,jdbcType=VARCHAR}
     </update>
     <select id="selectByBillNum" resultMap="BaseResultMap" parameterType="java.lang.String" >
         select

src/main/resources/mapper/waybill/NoCarWaybillMapper.xml

@@ -85,6 +85,12 @@
             <if test="noCarWayBill.batchNumEnd != null and noCarWayBill.batchNumEnd != ''">
                 and batchNumEnd = #{noCarWayBill.batchNumEnd}
             </if>
+            <if test="noCarWayBill.success == 1">
+                and billwayStatus in(1,2,3,4)
+            </if>
+            <if test="noCarWayBill.success == 2">
+                and billwayStatus in(-1,-2,-3)
+            </if>
         </where>
     </select>
     <select id="selectAllByPageException" resultMap="BaseResultMap">
@@ -108,7 +114,7 @@
                 and interfaceEndTime BETWEEN #{noCarWayBill.endBegin} and #{noCarWayBill.endEnd}
             </if>
 
-             and billwayStatus =4
+             and billwayStatus in (-1,-2,-3,4)
         </where>
     </select>
     <insert id="insert" parameterType="com.jkcredit.invoice.model.entity.waybill.NoCarWayBill" >

src/main/resources/mapper/waybill/SellCarTradeMapper.xml

@@ -13,6 +13,7 @@
         <result column="fee" property="fee"/>
         <result column="status" property="status"/>
         <result column="applId" property="applId"/>
+        <result column="days" property="days"/>
         <result column="companyName" property="companyName"/>
         <result column="companyReferencenum" property="companyReferencenum"/>
     </resultMap>
@@ -33,7 +34,7 @@
     </sql>
     <select id="selectAllByPage" resultMap="BaseResultMap">
         select
-        <include refid="baseSql" />
+        <include refid="baseSql" />,timestampdiff(day,aclTime,now()) days
         from t_SellCarTrade
         <where>
             <if test="sellCarTrade.companyName != null and sellCarTrade.companyName != ''">
@@ -58,7 +59,7 @@
                 and aclTime BETWEEN #{sellCarTrade.aclTimeBegin} and #{sellCarTrade.aclTimeEnd}
             </if>
             <if test="sellCarTrade.exceptionFlag != null and sellCarTrade.exceptionFlag != ''">
-                and date_add(aclTime,interval 10 day)>now() and status=2
+                and  now()>date_add(aclTime,interval 10 day) and status=2
             </if>
         </where>
     </select>