1

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CommonUserController.java

@@ -212,8 +212,8 @@ public class CommonUserController {
      */
     @Log(title = "发送验证码")
     @GetMapping("/sendVerifyCode")
-    public String sendVerifyCode(String phone,String identification) throws ServiceException {
-        return commonUserService.sendVerifyCode(phone,identification);
+    public String sendVerifyCode(String phone,String identification,String flag) throws ServiceException {
+        return commonUserService.sendVerifyCode(phone,identification,flag);
     }
 
     /**

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/exception/YExceptionEnum.java

@@ -53,6 +53,7 @@ public enum YExceptionEnum {
 	CONG_TERM_OF_PASS("ERROR30", "用户名或密码错误！"),
 	PAYEE_CARD_ADD("ERROR31", "请您添加银行卡！"),
 	CAR_FINISH_ADD("ERROR32", "尚未完成车辆认证！"),
+	SHANG_BAO_ERROR("ERROR33", "园区上报信息错误，详情见司机信息上报页面！"),
 	;
 	@Getter
 	private String value;

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ICommonUserService.java

@@ -38,7 +38,7 @@ public interface ICommonUserService extends IService<CommonUser> {
      * @return
      * @throws ServiceException
      */
-    String sendVerifyCode(String phone,String identification) throws ServiceException;
+    String sendVerifyCode(String phone,String identification,String flag) throws ServiceException;
 
 
     /**

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CommonUserServiceImpl.java

@@ -417,7 +417,7 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
      * @throws ServiceException
      */
     @Override
-    public String sendVerifyCode(String phone, String identification) throws ServiceException {
+    public String sendVerifyCode(String phone, String identification,String flag) throws ServiceException {
         if (StringUtils.isEmpty(phone)) {
             throw new AppServiceException(ExceptionDefinition.USER_PHONE_HAS_ENTRY);
         }
@@ -430,6 +430,15 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
                 throw new AppServiceException(ExceptionDefinition.USER_PHONE_NOT_EXIST);
             }
         }
+        //重置密码
+        if("2".equals(flag)){
+            //校验用户是否存在
+            List<CommonUser> targetUserList = this.selectList(new EntityWrapper<CommonUser>()
+                            .eq("phone", phone).eq("identification", identification));
+            if (CollectionUtils.isEmpty(targetUserList)) {
+                throw new AppServiceException(ExceptionDefinition.USER_PHONE_NOT_EXIST);
+            }
+        }
         String verifyCode = GeneratorUtil.genSixVerifyCode();
         System.out.println("verifyCode:" + verifyCode);
         SMSResult res = smsClient.sendRegisterVerify(phone, verifyCode);

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/DriverInfoServiceImpl.java

@@ -14,6 +14,7 @@ import com.yh.saas.plugin.yiliangyiyun.mapper.DriverInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.*;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.yh.saas.plugin.yiliangyiyun.util.EntityAnalyse;
+import lombok.SneakyThrows;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -23,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.net.HttpURLConnection;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -372,13 +374,13 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
         //查询司机列表
         HyDriverInfo hyDriverInfo1 = this.selectById(hyDriverInfo.getId());
         if (hyDriverInfo1 != null) {
-            //通过
+            //
             if ("1".equals(hyDriverInfo.getFlag())) {
                 //上报司机信息校验结果查询
                 String token = EntityAnalyse.GetJTToken();
                 hyDriverInfo.setToken(token);
                 if (!"通过".equals(EntityAnalyse.driverInfoCheck(hyDriverInfo))){
-                    return EntityAnalyse.driverInfoCheck(hyDriverInfo);
+                    throw new YException(YExceptionEnum.SHANG_BAO_ERROR);
                 }
 
                 hyDriverInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/OrderInfoServiceImpl.java

@@ -920,8 +920,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     if ("0".equals(orderInfo1.getFreightAdvance())) {
                         //非垫付订单
                         freightInfo.setPrepaidFreight(orderInfo1.getAdvanceCharge());
-                        freightInfo.setReceivableFreight(orderInfo1.getAdvanceCharge());
-                        freightInfo.setReceivabledFreight(orderInfo1.getAdvanceCharge());
+//                        freightInfo.setReceivableFreight(orderInfo1.getAdvanceCharge());
+//                        freightInfo.setReceivabledFreight(orderInfo1.getAdvanceCharge());
 
                         //生成货主冻结金额流向信息
                         HyFreezingMoneyInfo hyFreezingMoneyInfo = new HyFreezingMoneyInfo();
@@ -1062,13 +1062,13 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                             .eq("order_id", orderInfo.getId()).eq("delete_flag", "0"));
                     //非垫付订单
                     if ("0".equals(orderInfo1.getFreightAdvance())) {
-                        freightInfo.setPayableFreight(freightInfo.getActualFreight() - freightInfo.getDriverServiceCharge() - freightInfo.getPrepaidFreight());
+                        freightInfo.setPayableFreight(freightInfo.getActualFreight());
                         freightInfo.setNopayableFreight(freightInfo.getPayableFreight() - freightInfo.getPayabledFreight());
                         freightInfo.setOwnerFreightBalance(freightInfo.getActualFreight() - freightInfo.getPrepaidFreight());
                         freightInfo.setOwnerFreightBalanceDate(df.parse(Time));
-                        Double d = freightInfo.getReceivableFreight();
-                        freightInfo.setReceivableFreight(d + freightInfo.getOwnerFreightBalance() + freightInfo.getOwnerServiceCharge());
-                        freightInfo.setReceivabledFreight(freightInfo.getReceivableFreight());
+//                        Double d = freightInfo.getReceivableFreight();
+//                        freightInfo.setReceivableFreight(d + freightInfo.getOwnerFreightBalance() + freightInfo.getOwnerServiceCharge());
+//                        freightInfo.setReceivabledFreight(freightInfo.getReceivableFreight());
                         freightInfo.setTotalCollection(freightInfo.getActualFreight() - freightInfo.getDriverServiceCharge());
                         freightInfo.setTotalPayment(freightInfo.getActualFreight() + freightInfo.getOwnerServiceCharge());
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/CheckTxtUtil.java

@@ -5,6 +5,7 @@ package com.yh.saas.plugin.yiliangyiyun.util;
  * @author lsj
  *
  */
+import java.io.File;
 import java.io.FileInputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -36,7 +37,7 @@ public class CheckTxtUtil {
             HashSet<String> set = new HashSet<String>();
             try {
                 //获取敏感词文件
-                Workbook workbook = new XSSFWorkbook(new FileInputStream("E:\\checktxt\\mgck-master\\敏感词库表统计.xlsx"));
+                Workbook workbook = new XSSFWorkbook(new FileInputStream("templates" + File.separator + "敏感词库表统计.xlsx"));
                 // 获取第一个张表
                 Sheet sheet = workbook.getSheetAt(0);
                 // 获取每行中的字段