Merge remote-tracking branch 'origin/feature/relation_type_item' into feature/relation_type_item

sp-admin/static/sa.js

@@ -768,7 +768,7 @@ var sa = {
 		}
 		me.isEmail = function(str) {
 			str = str + '';
-			if((/^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/.test(str))){
+			if((/^[A-Za-z0-9_-\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/.test(str))){
 				return true;
 			}
 			return false;

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

@@ -258,7 +258,7 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
                 .setCarNo(car.getCarNo())
                 .setNoTaxPrice(noTaxPrice).setTaxPrice(taxPrice)
                 .setFeeType(TbFeeDetails.fee.PARK_FEE.getCode())
-                .setPayDay(toDay).setPayType(3).setCreateTime(now)
+                .setPayDay(toDay).setPayType(3).setCreateTime(now).setUpdateTime(now)
                 .setIsSettle(1).setPayMode(1).setPayTime(nowStr)
                 .setTransactionId(transactionId).setOutTradeNo(outTradeNo)
                 .setBusinessCarNo(car.getNo());
@@ -331,7 +331,7 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
                     .setFeeType(feeType)
                     .setItemTypeId(item.getItemTypeId()).setItemTypeName(item.getItemTypeName())
                     .setItemId(item.getItemId()).setItemName(item.getItemName())
-                    .setPayDay(toDay).setPayType(3).setCreateTime(now)
+                    .setPayDay(toDay).setPayType(3).setCreateTime(now).setUpdateTime(now)
                     .setBusinessItemId(item.getId() + "")
                     .setPickCustomerName(item.getPickCustomerName())
                     .setCustomerName(business.getCustomerName())
@@ -571,7 +571,7 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
             if(StrUtil.isNotEmpty(admin.getNickname())){
                 name = admin.getNickname();
             }
-            detail.setJiChaPerson(name);
+            detail.setJiChaPerson(name).setUpdateTime(new Date());
             String dayStr = DateUtil.format(detail.getCreateTime(), "yyyy-MM-dd");
             days.add(dayStr);
         }
@@ -592,7 +592,7 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
             if(StrUtil.isNotEmpty(admin.getNickname())){
                 name = admin.getNickname();
             }
-            detail.setKaiDanPerson(name);
+            detail.setKaiDanPerson(name).setUpdateTime(new Date());
             String dayStr = DateUtil.format(detail.getCreateTime(), "yyyy-MM-dd");
             days.add(dayStr);
         }
@@ -613,7 +613,7 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
             if(StrUtil.isNotEmpty(admin.getNickname())){
                 name = admin.getNickname();
             }
-            detail.setDiaoDuPerson(name);
+            detail.setDiaoDuPerson(name).setUpdateTime(new Date());
             String dayStr = DateUtil.format(detail.getCreateTime(), "yyyy-MM-dd");
             days.add(dayStr);
         }

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

@@ -431,12 +431,14 @@ public class TbFeeStatisticsService extends ServiceImpl<TbFeeStatisticsMapper, T
             BigDecimal totalPrice = new BigDecimal(0);
             BigDecimal totalTaxes = new BigDecimal(0);
             BigDecimal totalNoTaxPrice = new BigDecimal(0);
+            Integer num = 0;
             for (TbFeeDetails detail : detailsList) {
                 totalPrice = totalPrice.add(detail.getItemPrice());
                 totalTaxes = totalTaxes.add(detail.getTaxPrice());
                 totalNoTaxPrice = totalNoTaxPrice.add(detail.getNoTaxPrice());
+                num = num + detail.getNum();
             }
-            statistic.setTaxMoney(totalPrice).setTaxes(totalTaxes).setNoTaxMoney(totalNoTaxPrice);
+            statistic.setTaxMoney(totalPrice).setTaxes(totalTaxes).setNoTaxMoney(totalNoTaxPrice).setNum(num);
         }
         this.updateBatchById(list);
     }