已支付得订单不删除明细

app/utils/request.js

@@ -1,6 +1,6 @@
-// const server = 'http://127.0.0.1:8099/pro';
+const server = 'http://127.0.0.1:8099/pro';
 // const server = 'https://pco.aseanbusiness.cn/pro';
-const server = 'https://dxkaa1.bgigc.com/pro';
+// const server = 'https://dxkaa1.bgigc.com/pro';
 
 import common from '../common/js/common.js';
 

sp-server/src/main/java/com/pj/api/bo/SearchBO.java

@@ -0,0 +1,12 @@
+package com.pj.api.bo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+@Data
+@Accessors(chain = true)
+public class SearchBO implements Serializable {
+    private String carNo;
+    private String id;
+}

sp-server/src/main/java/com/pj/api/jh/service/JhService.java

@@ -164,7 +164,7 @@ public class JhService {
             return;
         }
         NotifyBO notifyBO = new NotifyBO();
-        notifyBO.setOutTradeNo(bo.getOutTradeNo()).setTimeEnd(bo.getSuccessTime()).setTradeStatus(orderStatus)
+        notifyBO.setOutTradeNo(bo.getOutTradeNo()).setTradeStatus(orderStatus)
                 .setTransactionId(bo.getBankTrxNo()).setTimeEnd(bo.getSuccessTime())
                 .setTotalFee(NumberUtil.mul(bo.getOrderPrice(), 100 + "").toString());
         wxService.WxNotify(notifyBO);

sp-server/src/main/java/com/pj/api/service/ApiService.java

@@ -9,6 +9,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.pj.api.bo.InOutRecordBO;
 import com.pj.api.bo.OtherBusinessBO;
+import com.pj.api.bo.SearchBO;
 import com.pj.api.wx.bo.MsgDataBO;
 import com.pj.api.wx.service.WxService;
 import com.pj.constants.UserTypeEnum;
@@ -109,8 +110,6 @@ public class ApiService {
     private MyConfig myConfig;
 
 
-
-
     public List<InOutRecordBO> getInOutRecord(SoMap so) {
         List<TbPassRecord> passRecords = tbPassRecordService.getList(so);
         List<InOutRecordBO> recordList = new ArrayList<>();
@@ -136,12 +135,23 @@ public class ApiService {
         }
     }
 
-    public List<TbBusinessCar> searchPartCar(String carNo) {
+    public List<SearchBO> searchPartCar(String carNo) {
         if (StrUtil.isEmpty(carNo) || StrUtil.length(carNo) < 3) {
             return Collections.emptyList();
         }
+        carNo = carNo.toUpperCase();
         //查询出未缴费的车辆
-        return tbBusinessCarService.searchForPayCar(carNo);
+        //有业务的车
+        List<TbBusinessCar> businessCarList = tbBusinessCarService.searchForPayCar(carNo);
+        //无业务的车
+        List<TbBusinessCar> noBusinessCarList = tbBusinessCarService.findTheNoBusinessCar(carNo);
+        businessCarList.addAll(noBusinessCarList);
+        List<SearchBO> searchBOList = businessCarList.stream().map(tbBusinessCar -> {
+            SearchBO searchBO = new SearchBO();
+            searchBO.setId(tbBusinessCar.getId()).setCarNo(tbBusinessCar.getCarNo());
+            return searchBO;
+        }).distinct().collect(Collectors.toList());
+        return searchBOList;
     }
 
     public void confirm(List<String> ids) {
@@ -272,9 +282,10 @@ public class ApiService {
         });
         return list;
     }
-    public   String handlerDesc(String desc){
-        if (desc.getBytes(Charset.forName("utf-8")).length>128){
-            desc=StrUtil.sub(desc,0,desc.lastIndexOf("-"));
+
+    public String handlerDesc(String desc) {
+        if (desc.getBytes(Charset.forName("utf-8")).length > 128) {
+            desc = StrUtil.sub(desc, 0, desc.lastIndexOf("-"));
             handlerDesc(desc);
         }
         return desc;

sp-server/src/main/java/com/pj/api/wx/service/WxService.java

@@ -220,10 +220,6 @@ public class WxService {
             log.error("========订单不存在==========:{}", outTradeNo);
             return;
         }
-        if (StrUtil.equals("SUCCESS", tbOrder.getOrderStatus())) {
-            log.error("========订单已支付==========:{}", outTradeNo);
-            return;
-        }
         String total_fee = notifyBO.getTotalFee();
         BigDecimal money = new BigDecimal(total_fee).divide(new BigDecimal(100), 2, BigDecimal.ROUND_UP);
         String attachStr = tbOrder.getAttach();
@@ -283,7 +279,7 @@ public class WxService {
                 tbAccountService.recharge(chargeBO.getId(), chargeBO.getC(), TbChargeRecord.Ch.WECHAT.getType(), money);
             }
         }
-        tbOrder.setOrderStatus("SUCCESS")
+        tbOrder.setOrderStatus(orderStatus)
                 .setTransactionId(notifyBO.getTransactionId())
                 .setCompleteDate(notifyBO.getTimeEnd());
         tbOrderService.updateById(tbOrder);

sp-server/src/main/java/com/pj/project/tb_business/TbBusinessService.java

@@ -787,7 +787,9 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
         if (cars.isEmpty()) {
             throw new BusinessException("作业车辆不能为空");
         }
-        tbBusinessItemService.removeByBusinessId(id);
+        if (TbBusiness.PayStatus.HAS_PAY_CONFIRM.getCode()!=dbBusiness.getPayStatus()) {
+            tbBusinessItemService.removeByBusinessId(id);
+        }
         Date now = new Date();
         List<RelationBusinessCar> relationBusinessCars = relationBusinessCarService.findByBusinessId(id);
         List<String> businessCarIds = cars.stream().filter(tbBusinessCar -> StrUtil.isNotEmpty(tbBusinessCar.getId()))

sp-server/src/main/java/com/pj/project/tb_business_car/TbBusinessCarMapper.xml

@@ -106,8 +106,7 @@
 	</select>
     <select id="findTheNoBusinessCar" resultType="com.pj.project.tb_business_car.TbBusinessCar">
             SELECT * from tb_business_car
-             WHERE (business_id is null or business_id='')
-             and car_no like CONCAT('%',#{carNo},'%')
+             WHERE  car_no like CONCAT('%',#{carNo},'%')
              and real_in_time is not null
              and real_out_time is null
     </select>

sp-server/src/main/java/com/pj/project/tb_order/TbOrderService.java

@@ -69,10 +69,12 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
             String orderStatus = result.getStr("orderStatus");
             tbOrder.setOrderStatus(orderStatus);
             if (StrUtil.equals(orderStatus, "SUCCESS") || StrUtil.equals(orderStatus, "FINISH")) {
+                String completeDate=result.getStr("completeDate");
                 tbOrder.setTransactionId(result.getStr("bankTrxNo"))
-                        .setCompleteDate(result.getStr("completeDate"));
+                        .setCompleteDate(completeDate);
                 JhNotifyBO notifyBO = new JhNotifyBO();
-                notifyBO.setAttach(tbOrder.getAttach()).setBankTrxNo(tbOrder.getTransactionId()).setTradeStatus(orderStatus)
+                notifyBO.setAttach(tbOrder.getAttach()).setBankTrxNo(tbOrder.getTransactionId()).setSuccessTime(completeDate)
+                        .setTradeStatus(orderStatus)
                         .setOutTradeNo(tbOrder.getOutTradeNo()).setOrderPrice(tbOrder.getPrice());
                 jhService.notifyResult(notifyBO);
             }