过滤条件

app/manifest.json

@@ -85,7 +85,7 @@
     "vueVersion" : "2",
     "h5" : {
         "router" : {
-            "base" : "/test/",
+            "base" : "/h5/",
             "mode" : "history"
         },
         "devServer" : {

app/pages/business-order/partner-business-item.vue

@@ -22,6 +22,12 @@
 						<text class="p2">{{businessItem.createTime}}</text>
 					</view>
 				</view>
+				<view class="c" v-if="businessItem.cardNo">
+					<view class="item">
+						<text class="p1">车辆:</text>
+						<text class="p2">{{businessItem.cardNo}}</text>
+					</view>
+				</view>
 				<view class="c">
 					<view class="item" v-if="businessItem.pickTime">
 						<text class="p1">接单时间:</text>

app/utils/request.js

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

sp-admin/sa-view/tb-business/tb-car-disincle-list.html

@@ -69,7 +69,7 @@
 								@click="update(s.row)">
 								修改</el-button>
 							<el-button class="c-btn" type="danger"
-								v-if="sa.isAuth('tb-flex-business-del')&&s.row.adminConfirmInput==0"
+								v-if="sa.isAuth('tb-flex-business-del')&&s.row.adminConfirmInput==0&&s.row.payMoney==0"
 								@click="del(s.row)">删除
 							</el-button>
 						</template>

sp-admin/static/sa.js

@@ -22,7 +22,7 @@ var sa = {
 		api_url: 'https://dxkaa1.bgigc.com/pro',
 		web_url: 'http://www.baidu.com'
 	}
-	sa.cfg = cfg_test; // 最终环境 , 上线前请选择正确的环境
+	sa.cfg = cfg_dev; // 最终环境 , 上线前请选择正确的环境
 })();
 
 

sp-server/app.pid

@@ -1 +1 @@
-21340
+26984

sp-server/src/main/java/com/pj/api/jh/task/CheckPayStatusTask.java

@@ -52,7 +52,7 @@ public class CheckPayStatusTask extends Task {
         String orderStatus = result.getStr("orderStatus");
         if (StrUtil.equals(orderStatus, "WAITING_PAYMENT")) {
             try {
-                Thread.sleep(2000);
+                Thread.sleep(5000);
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }

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

@@ -151,10 +151,10 @@ public class ApiService {
         otherBusinessCarList = otherBusinessCarList.stream().filter(tbBusinessCar -> {
             String businessCarId = tbBusinessCar.getId();
             List<TbBusiness> businesses = tbBusinessService.findOtherBusinessByCarId(businessCarId);
-           return businesses.stream().anyMatch(tbBusiness -> tbBusiness.getPayMoney().doubleValue() < tbBusiness.getTotalMoney().doubleValue()
-                   && (((TbItemType.PayStep.BEFORE_CONFIRM.getCode().equals(tbBusiness.getPayStep()) && tbBusiness.getAdminConfirmInput() >= 0)
-                   || (TbItemType.PayStep.AFTER_CONFIRM.getCode().equals(tbBusiness.getPayStep()) && tbBusiness.getAdminConfirmInput() == 1))
-           ));
+            return businesses.stream().anyMatch(tbBusiness -> tbBusiness.getPayMoney().doubleValue() < tbBusiness.getTotalMoney().doubleValue()
+                    && (((TbItemType.PayStep.BEFORE_CONFIRM.getCode().equals(tbBusiness.getPayStep()) && tbBusiness.getAdminConfirmInput() >= 0)
+                    || (TbItemType.PayStep.AFTER_CONFIRM.getCode().equals(tbBusiness.getPayStep()) && tbBusiness.getAdminConfirmInput() == 1))
+            ));
         }).collect(Collectors.toList());
         List<TbBusinessCar> cars = tbBusinessCarService.findTheNoBusinessCar(carNo);
         //过滤掉不用缴费的车
@@ -283,7 +283,19 @@ public class ApiService {
     }
 
     public List<TbBusinessItem> getPartnerBusinessItem(SoMap startPage) {
-        return tbBusinessItemService.getList(startPage);
+        List<TbBusinessItem> list = tbBusinessItemService.getList(startPage);
+        list.parallelStream().forEach(tbBusinessItem -> {
+            TbBusiness tbBusiness = tbBusinessService.getById(tbBusinessItem.getBusinessId());
+            if (TbBusiness.BusinessType.CAR_DISINCLE.getCode().equals(tbBusiness.getBusinessType())) {
+                TbBusinessCar tbBusinessCar = tbBusinessCarService.getById(tbBusiness.getBusinessCarId());
+                tbBusinessItem.setCardNo(tbBusinessCar.getCarNo());
+            } else {
+                List<TbBusinessCar> cars = tbBusinessCarService.findByBusinessId(tbBusiness.getId());
+                String carStr = cars.stream().map(TbBusinessCar::getCarNo).collect(Collectors.joining("、"));
+                tbBusinessItem.setCardNo(carStr);
+            }
+        });
+        return list;
     }
 
     public void addCarDisinfect(OtherBusinessBO otherBusinessBO) {

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

@@ -199,6 +199,11 @@ public class WxService {
 
     public void WxNotify(NotifyBO notifyBO) {
         String outTradeNo = notifyBO.getOutTradeNo();
+        if (StrUtil.isNotEmpty(RedisUtil.get(outTradeNo))){
+            log.error("========订单已处理==========:{}", outTradeNo);
+            return;
+        }
+        RedisUtil.setByHour(outTradeNo,DateUtil.now(),1);
         TbOrder tbOrder = tbOrderService.findByOutTradeNo(outTradeNo);
         if (tbOrder == null) {
             log.error("========订单不存在==========:{}", outTradeNo);

sp-server/src/main/java/com/pj/project/tb_fee_details/TbFeeDetailsService.java

@@ -8,6 +8,7 @@ import java.util.*;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
@@ -26,6 +27,7 @@ import com.pj.project.tb_business_item.TbBusinessItem;
 import com.pj.project.tb_fee_statistics.TbFeeStatistics;
 import com.pj.project4sp.uploadfile.UploadUtil;
 import com.pj.utils.so.SoMap;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.core.io.ClassPathResource;
@@ -44,6 +46,7 @@ import javax.annotation.Resource;
  */
 @Service
 @Transactional
+@Slf4j
 public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDetails> implements IService<TbFeeDetails> {
 
     /**
@@ -140,8 +143,8 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
         return getOne(qw);
     }
 
-    @Async
     public void chargeParkFee(List<PriceBO> cars, String transactionId, String outTradeNo) {
+        log.info("进入计算停车费:{}", JSONUtil.toJsonStr(cars));
         for (PriceBO bo1 : cars) {
             if(bo1.getP().compareTo(BigDecimal.valueOf(0)) == 0){
                 continue;

sp-server/src/main/java/com/pj/project/tb_fee_statistics/TbFeeStatisticsService.java

@@ -9,6 +9,7 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.Month;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
@@ -32,6 +33,7 @@ import com.pj.project.tb_item_type.TbItemType;
 import com.pj.project.tb_item_type.TbItemTypeService;
 import com.pj.project4sp.uploadfile.UploadUtil;
 import com.pj.utils.so.SoMap;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.scheduling.annotation.Async;
@@ -49,6 +51,7 @@ import javax.annotation.Resource;
  */
 @Service
 @Transactional
+@Slf4j
 public class TbFeeStatisticsService extends ServiceImpl<TbFeeStatisticsMapper, TbFeeStatistics> implements IService<TbFeeStatistics> {
 
     /**
@@ -123,7 +126,7 @@ public class TbFeeStatisticsService extends ServiceImpl<TbFeeStatisticsMapper, T
         return getOne(qw);
     }
 
-    //@Async
+
     public void countParkFee(List<PriceBO> cars) {
         Date now = new Date();
         String toDay = DateUtil.format(now, "yyyy-MM-dd");

sp-server/src/main/java/com/pj/project/tb_item_type/TbItemTypeController.java

@@ -100,6 +100,8 @@ public class TbItemTypeController {
     @RequestMapping("getList")
     public AjaxJson getList() {
         SoMap so = SoMap.getRequestSoMap();
+
+
         List<TbItemType> list = tbItemTypeService.getList(so.startPage());
         return AjaxJson.getPageData(so.getDataCount(), list);
     }

sp-server/src/main/java/com/pj/project/tb_item_type/TbItemTypeService.java

@@ -5,8 +5,13 @@ import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.pj.constants.RoleEnum;
+import com.pj.constants.UserTypeEnum;
+import com.pj.current.satoken.StpUserUtil;
 import com.pj.project.relation_type_item.RelationTypeItem;
 import com.pj.project.relation_type_item.RelationTypeItemService;
+import com.pj.project.tb_costomer.TbCostomer;
+import com.pj.project.tb_costomer.TbCostomerService;
 import com.pj.project.tb_item.TbItem;
 import com.pj.project.tb_item.TbItemService;
 import com.pj.utils.so.SoMap;
@@ -35,6 +40,9 @@ public class TbItemTypeService extends ServiceImpl<TbItemTypeMapper, TbItemType>
     @Resource
     private RelationTypeItemService relationTypeItemService;
 
+    @Resource
+    private TbCostomerService tbCostomerService;
+
 
     /**
      * 删
@@ -56,14 +64,26 @@ public class TbItemTypeService extends ServiceImpl<TbItemTypeMapper, TbItemType>
      * 查集合 - 根据条件（参数为空时代表忽略指定条件）
      */
     List<TbItemType> getList(SoMap so) {
-        return tbItemTypeMapper.getList(so);
+        List<TbItemType> list = tbItemTypeMapper.getList(so);
+        String customerId = StpUserUtil.getCustomerId();
+        if (!UserTypeEnum.PLATFORM_ADMIN.getCustomerId().equals(customerId)) {
+            TbCostomer tbCostomer = tbCostomerService.getById(customerId);
+            if (!TbCostomer.CustomerEnum.BUSINESS_TYPE.getType().equals(tbCostomer.getType())) {
+                list = list.stream().filter(tbItemType -> {
+                    List<TbItem> items = tbItemService.getItemTypeById(tbItemType.getId());
+                    List<String> businessTypeList = items.stream().map(TbItem::getBusinessType).collect(Collectors.toList());
+                    return businessTypeList.contains(tbCostomer.getType());
+                }).collect(Collectors.toList());
+            }
+        }
+        return list;
     }
 
 
     public TbItemType getItemTypeById(String id) {
         TbItemType tbItemType = super.getById(id);
-       List<TbItem>items= tbItemService.getItemTypeById(id);
-       tbItemType.setItems(items);
+        List<TbItem> items = tbItemService.getItemTypeById(id);
+        tbItemType.setItems(items);
         return tbItemType;
     }
 }