Merge branch 'feature/relation_type_item' into feature/push_invoice

# Conflicts:
#	sp-server/src/main/java/com/pj/project/tb_fee_details/TbFeeDetailsService.java
#	sp-server/src/main/resources/static/day-fee-new.xlsx

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

@@ -253,9 +253,12 @@ public class ApiService {
         if (tbBusinessItem.getPick() == 1) {
             return AjaxJson.getError("您慢了一步，其他用户已接单");
         }
+        String adminId = spAdmin.getId()+"";
+        String adminName = StrUtil.isNotEmpty(spAdmin.getNickname()) ? spAdmin.getNickname():spAdmin.getName();
         String customerId = spAdmin.getCustomerId();
         TbCostomer tbCostomer = tbCostomerService.getById(customerId);
-        tbBusinessItem.setPick(1).setPickTime(new Date()).setPickCustomerId(tbCostomer.getId()).setPickCustomerName(tbCostomer.getName());
+        tbBusinessItem.setPick(1).setPickTime(new Date()).setPickCustomerId(tbCostomer.getId()).setPickCustomerName(tbCostomer.getName())
+            .setPickBy(adminName).setPickByAdminId(adminId);
         tbBusinessItemService.updateById(tbBusinessItem);
         //todo 通知录入人员 已接单
         List<SpAdmin> spAdminList = spAdminService.findByCustomerId(UserTypeEnum.PLATFORM_ADMIN.getCustomerId());

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

@@ -727,22 +727,6 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
                     .setItemName(db.getItemName()).setItemPrice(db.getPrice()).setRemark(tbItem.getRemark())
                     .setItemTypeId(typeId).setItemTypeName(tbItemType.getName())
                     .setUnit(db.getUnit()).setTotal(itemTotalPrice).setCreateTime(now);
-            //合作伙伴创建记录接单操作人by lzm
-//            String businessType = item.getBusinessType();
-//            if (!StrUtil.equals(businessType, TbCostomer.CustomerEnum.BUSINESS_TYPE.getType())) {
-//                String currCustomerId = StpUserUtil.getCustomerId();
-//                TbCostomer currCostomer = tbCostomerService.getById(currCustomerId);
-//                List<String> customerType = new ArrayList<>();
-//                if (currCostomer != null) {
-//                    customerType = StrUtil.splitTrim(currCostomer.getType(), ",");
-//                }
-//                if (customerType.contains(businessType)) {
-//                    SpAdmin currAdmin = StpUserUtil.getAdmin();
-//                    String adminName = StrUtil.isNotEmpty(currAdmin.getNickname()) ? currAdmin.getNickname():currAdmin.getName();
-//                    item.setPickBy(adminName).setPickByAdminId(currAdmin.getId()+"");
-//                }
-//            }
-            //
             price = price.add(itemTotalPrice);
             itemList.add(item);
             index++;
@@ -864,24 +848,6 @@ public class TbBusinessService extends ServiceImpl<TbBusinessMapper, TbBusiness>
                         .setItemName(db.getItemName()).setItemPrice(db.getPrice()).setRemark(tbItem.getRemark())
                         .setItemTypeId(tbItem.getTypeId()).setItemTypeName(tbItemType.getName())
                         .setUnit(db.getUnit()).setTotal(itemTotalPrice).setCreateTime(now);
-                //by lzm
-//                String businessType = item.getBusinessType();
-//                if (!StrUtil.equals(businessType, TbCostomer.CustomerEnum.BUSINESS_TYPE.getType())) {
-//                    String currCustomerId = StpUserUtil.getCustomerId();
-//                    TbCostomer currCostomer = tbCostomerService.getById(currCustomerId);
-//                    List<String> customerType = new ArrayList<>();
-//                    if (currCostomer != null) {
-//                        customerType = StrUtil.splitTrim(currCostomer.getType(), ",");
-//                    }
-//                    if (customerType.contains(businessType)) {
-//                        SpAdmin currAdmin = StpUserUtil.getAdmin();
-//                        String adminName = StrUtil.isNotEmpty(currAdmin.getNickname()) ? currAdmin.getNickname():currAdmin.getName();
-//                        item.setPickBy(adminName).setPickByAdminId(currAdmin.getId()+"");
-//                    }else {
-//                        item.setPickBy("").setPickByAdminId("");
-//                    }
-//                }
-                //
                 price = price.add(itemTotalPrice);
                 itemList.add(item);
                 index++;

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

@@ -187,13 +187,6 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
         return list(qw);
     }
 
-    public List<TbFeeDetails> findBusinessFeeByTransactionId(String transactionId){
-        QueryWrapper<TbFeeDetails> qw = new QueryWrapper<>();
-        qw.ne("fee_type", TbFeeDetails.fee.PARK_FEE)
-                .like("transaction_id", transactionId);
-        return list(qw);
-    }
-
 
     public void chargeParkFee(List<PriceBO> cars, String transactionId, String outTradeNo, Date now) {
         log.info("进入计算停车费:{}", JSONUtil.toJsonStr(cars));
@@ -529,7 +522,7 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
             totalListList.add(totalList2);
             totalListList.add(totalList1);
             for (int i=0;i<22;i++){
-                if(i==7){
+                if(i==0){
                     totalList2.add("合计");
                 }else if(i==8){
                     totalList2.add(allDayFee.toString());