后端代码提交

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

@@ -339,6 +339,13 @@ public class SelfCarServiceLImpl implements SelfCarServiceL {
                     BeanUtils.copyProperties(b2BInvoiceListModel,selfCarInvoice);
                     selfCarInvoice.setInvoiceMakeTime(DateUtil.tTimeToDate(selfCarInvoice.getInvoiceMakeTime()));
                     selfCarInvoice.setExTime(DateUtil.tTimeToDate(selfCarInvoice.getExTime()));
+                    selfCarInvoice.setCustomerName(customer.getCustomerName());
+                    selfCarInvoice.setCompanyName(customerRec.getCompanyName());
+                    selfCarInvoice.setBuyerTaxpayerCode(customerRec.getCompanyReferencenum());
+                    selfCarInvoice.setBuyerName(customerRec.getCompanyName());
+                    selfCarInvoice.setCompanyNum(customerCarRec.getCompanyNum());
+                    selfCarInvoice.setEnStation(b2BInvoiceListModel.getEnStationName());
+                    selfCarInvoice.setExStation(b2BInvoiceListModel.getExStationName());
                     if(selfCarInvoiceMapper.selectByTradeAndInvoiceMakeTime(selfCarInvoice)==null || selfCarInvoiceMapper.selectByTradeAndInvoiceMakeTime(selfCarInvoice).size()==0){
                         selfCarInvoiceMapper.insert(selfCarInvoice);
                     }

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

@@ -7,6 +7,7 @@ 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.DateUtil;
 import com.jkcredit.invoice.util.RespR;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -78,6 +79,11 @@ public class SelfCarTradeServiceImpl extends ServiceImpl<SellCarTradeMapper,Self
         });
         for(Map.Entry<String,TradeRequestVo> elm:map.entrySet()){
             TradeRequestVo tradeRequestVo = elm.getValue();
+            //开始时间和结束时间前后加一天
+            String statOrg =  tradeRequestVo.getStartTime().split(" ")[0];
+            String endOrg = tradeRequestVo.getEndTime().split(" ")[0];
+            tradeRequestVo.setStartTime(DateUtil.getDateAfterDays(statOrg,-1)+" 00:00:00");
+            tradeRequestVo.setEndTime(DateUtil.getDateAfterDays(endOrg,1)+" 00:00:00");
             selfCarService.getTradeList(tradeRequestVo);
         }
         return true;

src/main/java/com/jkcredit/invoice/task/ScheduledBillTask.java

@@ -9,6 +9,7 @@ import com.jkcredit.invoice.model.entity.waybill.NoCarWayBill;
 import com.jkcredit.invoice.service.lowerService.NoCarService;
 import com.jkcredit.invoice.service.lowerService.SelfCarServiceL;
 import com.jkcredit.invoice.service.lowerService.vo.SelfCarDueQueryVo;
+import com.jkcredit.invoice.service.lowerService.vo.TradeRequestVo;
 import com.jkcredit.invoice.util.DateUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,6 +58,7 @@ public class ScheduledBillTask {
     public void delGetInvoce(Integer historyFlag){
         NoCarWayBill carWayBill = new NoCarWayBill();
         carWayBill.setHisFlag(historyFlag);
+        carWayBill.setInterType(1);
         carWayBill.setBillwayStatus(2);
         List<NoCarWayBill> noCarWayBillsMdEnd = noCarWaybillMapper.selectByHisFlagAndBillStatus(carWayBill);
         if(noCarWayBillsMdEnd!=null && noCarWayBillsMdEnd.size()>0){
@@ -97,6 +99,14 @@ public class ScheduledBillTask {
               String after = DateUtil.getDateAfterDays(curr,+1);
               selfCarDueQueryVo.setStartTime(befor+" 00:00:00");
               selfCarDueQueryVo.setEndTime(after+"00:00:00");
+              //查询交易id
+              TradeRequestVo tradeRequestVo = new TradeRequestVo();
+              tradeRequestVo.setStartTime(befor+" 00:00:00");
+              tradeRequestVo.setEndTime(after+"00:00:00");
+              tradeRequestVo.setCompanyName(customerCarRec.getCustomerName());
+              tradeRequestVo.setEtcId(customerCarRec.getEtcNum());
+              tradeRequestVo.setTradeStatus(3);
+              selfCarService.getTradeList(tradeRequestVo);
               selfCarService.getSelfCarInvoicesByTime(selfCarDueQueryVo);
           }catch (Exception e){
               e.printStackTrace();

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

@@ -39,6 +39,7 @@
                 AND  operType = #{customerOper.operType}
             </if>
         </where>
+         order by batchNumber desc
     </select>
     <insert id="insert" parameterType="com.jkcredit.invoice.model.entity.customer.CustomerOper" >
         insert into t_cusomerOper (

src/main/resources/mapper/invoice/SelfCarInvoiceMapper.xml

@@ -57,8 +57,8 @@
     </sql>
     <select id="selectAllByPage" resultMap="BaseResultMap">
         select
-        <include refid="baseSql" />,(select t.status from t_SellCarTrade t where t.tradeId = tradeId ) tradeStatus,(select f.calTime from t_SelfCalculateInfor f where f.etcNum = cardId and find_in_set(exTime,f.calTime)) calculateTime
-        from t_SelfCarInvoice
+        <include refid="baseSql" />,(select t.status from t_SellCarTrade t where t.tradeId = g.tradeId ) tradeStatus,(select f.calTime from t_SelfCalculateInfor f where f.etcNum = cardId and instr(g.exTime,f.calTime)) calculateTime
+        from t_SelfCarInvoice g
         <where>
             <if test="selfCarInvoice.companyName != null and selfCarInvoice.companyName != ''">
                 and companyName LIKE CONCAT('%',#{selfCarInvoice.companyName},'%')