1.优化型号列表

2.app重置密码
3.手续费分充值手续费和提现手续费

electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java

@@ -6,18 +6,20 @@ import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
 import com.aliyuncs.exceptions.ClientException;
-import com.ruoyi.common.constant.ServiceConstants;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.AsArticleClassify;
 import com.ruoyi.common.core.domain.entity.AsUser;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.CommonUtil;
 import com.ruoyi.common.utils.SendAliSmsUtil;
 import com.ruoyi.common.utils.SendSmsVo;
 import com.ruoyi.common.utils.map.GeoUtils;
+import com.ruoyi.framework.web.service.SysLoginService;
 import com.ruoyi.system.domain.*;
 import com.ruoyi.system.mapper.AsDeviceMapper;
 import com.ruoyi.system.mapper.AsUserMapper;
@@ -29,7 +31,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -74,6 +75,12 @@ public class AppController extends BaseController
     @Autowired
     private ISysDeptService deptService;
 
+    @Autowired
+    private SysLoginService loginService;
+
+    @Autowired
+    private IEtHardwareVersionService etHardwareVersionService;
+
     @Value("${aliyun.accessKeyId}")
     private String accessKeyId;
 
@@ -536,6 +543,25 @@ public class AppController extends BaseController
         return AjaxResult.success();
     }
 
+    /**
+     * app忘记密码
+     */
+    @Log(title = "app忘记密码", businessType = BusinessType.UPDATE)
+    @PutMapping("/forgetAppPwd")
+    public AjaxResult forgetAppPwd(String phone,String phoneCode, String newPassword,String uuid)
+    {
+        logger.info("【app忘记密码】请求参数：phone:{},phoneCode:{},newPassword:{}",phone,phoneCode,newPassword);
+        return success(loginService.forgetAppPwd(phone,phoneCode,newPassword,uuid));
+    }
 
+    /**
+     * 查询硬件版本列表
+     */
+    @GetMapping("/hardwareVersion/list")
+    public AjaxResult list(EtHardwareVersion etHardwareVersion)
+    {
+        List<EtHardwareVersion> list = etHardwareVersionService.selectEtHardwareVersionList(etHardwareVersion);
+        return success(list);
+    }
 
 }

electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java

@@ -101,9 +101,6 @@ public class AppVerifyController extends BaseController
     @Autowired
     private IEtCapitalFlowService etCapitalFlowService;
 
-    @Autowired
-    private IEtWithdrawService etWithdrawService;
-
     @Autowired
     private IWxPayService wxPayService;
 
@@ -800,12 +797,13 @@ public class AppVerifyController extends BaseController
      */
     @Log(title = "设备绑定", businessType = BusinessType.BAND)
     @PostMapping("/band")
-    public AjaxResult bandSn(String sn,String mac)
+    public AjaxResult bandSn(String sn,String mac,Long hardwareVersionId)
     {
-        logger.info("sn和mac号绑定：【sn="+sn+"】，【mac="+mac+"】");
+        logger.info("sn和mac号绑定：【sn="+sn+"】，【mac="+mac+"】,【hardwareVersionId="+hardwareVersionId+"】");
         AsDevice asDevice = new AsDevice();
         asDevice.setSn(sn);
         asDevice.setMac(mac);
+        asDevice.setHardwareVersionId(hardwareVersionId);
         asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_NOT_BAND);
         asDevice.setCreateTime(DateUtils.getNowDate());
         return toAjax(asDeviceService.bandSn(asDevice));
@@ -1100,4 +1098,35 @@ public class AppVerifyController extends BaseController
         return success(i);
     }
 
+
+    /**
+     * app重置密码
+     */
+    @Log(title = "app重置密码", businessType = BusinessType.UPDATE)
+    @PutMapping("/resetAppPwd")
+    public AjaxResult resetAppPwd(String oldPassword, String newPassword)
+    {
+        LoginUser loginUser = getLoginUser();
+        AsUser asUser = loginUser.getAsUser();
+        Long userId = asUser.getUserId();
+        String password = asUser.getPassword();
+        if (!SecurityUtils.matchesPassword(oldPassword, password))
+        {
+            return error("修改密码失败，旧密码错误");
+        }
+        if (SecurityUtils.matchesPassword(newPassword, password))
+        {
+            return error("新密码不能与旧密码相同");
+        }
+        newPassword = SecurityUtils.encryptPassword(newPassword);
+        if (asUserMapper.updateUserPwd(userId, newPassword) > 0)
+        {
+            // 更新缓存用户密码
+            loginUser.getAsUser().setPassword(newPassword);
+            tokenService.setLoginUser(loginUser);
+            return success();
+        }
+        return error("修改密码异常，请联系管理员");
+    }
+
 }

electripper-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -8,6 +8,7 @@ import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.EtAreaDept;
@@ -69,6 +70,18 @@ public class SysDeptController extends BaseController
         return success(depts);
     }
 
+    /**
+     * 获取运营商列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:dept:list')")
+    @GetMapping("/list2")
+    public TableDataInfo list2(SysDept dept)
+    {
+        startPage();
+        List<SysDept> depts = deptService.selectDeptList(dept);
+        return getDataTable(depts);
+    }
+
     /**
      * 查询运营商列表（排除节点）
      */

electripper-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java

@@ -1,14 +1,5 @@
 package com.ruoyi.web.controller.system;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.core.controller.BaseController;
@@ -22,10 +13,13 @@ import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.MimeTypeUtils;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 个人信息 业务处理
- * 
+ *
  * @author ruoyi
  */
 @RestController

electripper-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java

@@ -115,8 +115,20 @@ public class SysDept extends BaseEntity
     /** 区域名称 */
     private String areaName;
 
+    /** 提现手续费类型： 1-按比例；2-按每笔 */
     public String handlingChargeType;
 
+    /** 提现手续费 */
+    public String withdrawHandlingCharge;
+
+    public String getWithdrawHandlingCharge() {
+        return withdrawHandlingCharge;
+    }
+
+    public void setWithdrawHandlingCharge(String withdrawHandlingCharge) {
+        this.withdrawHandlingCharge = withdrawHandlingCharge;
+    }
+
     public String getHandlingChargeType() {
         return handlingChargeType;
     }

electripper-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

@@ -16,6 +16,7 @@ import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.exception.user.*;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.MessageUtils;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.http.HttpUtils;
 import com.ruoyi.common.utils.ip.IpUtils;
@@ -240,9 +241,7 @@ public class SysLoginService
             asUser.setLoginDate(DateUtils.getNowDate());
             asUser.setCreateTime(DateUtils.getNowDate());
             asUser.setWxopenid(openId);
-            if(!asUser.getAreaId().contains(areaId)){
+            asUser.setAreaId(areaId);
-                asUser.setAreaId(asUser.getAreaId()+","+areaId);
-            }
             if(dept.getIsUsePlatformApp().equals("true")){
                 asUser.setAppName("创享电动车");
                 asUser.setAppId(dept.getAppid());
@@ -261,9 +260,10 @@ public class SysLoginService
                 user.setAppName(dept.getAppName());
                 user.setAppId(dept.getAppid());
             }
-            if(!user.getAreaId().contains(areaId)){
+//            if(!user.getAreaId().contains(areaId)){
-                user.setAreaId(user.getAreaId()+","+areaId);
+//                user.setAreaId(user.getAreaId()+","+areaId);
-            }
+//            }
+            user.setAreaId(areaId);
             int i = asUserService.updateUser(user);
         }
         Authentication authentication = null; // 用户验证
@@ -316,10 +316,11 @@ public class SysLoginService
         if(ObjectUtils.isEmpty(user)){
            throw new ServiceException("未查询到用户信息");
         }else{
-            String areaId1 = user.getAreaId();
+//            String areaId1 = user.getAreaId();
-            if(!areaId1.contains(areaId)){
+//            if(!areaId1.contains(areaId)){
-               user.setAreaId(user.getAreaId()+","+areaId);
+//               user.setAreaId(user.getAreaId()+","+areaId);
-            }
+//            }
+            user.setAreaId(areaId);
             int i = asUserService.updateUser(user);
         }
         Authentication authentication = null; // 用户验证
@@ -370,9 +371,7 @@ public class SysLoginService
             asUser.setLoginIp(IpUtils.getIpAddr());
             asUser.setLoginDate(DateUtils.getNowDate());
             asUser.setCreateTime(DateUtils.getNowDate());
-            if(!asUser.getAreaId().contains(areaId)){
+            asUser.setAreaId(areaId);
-                asUser.setAreaId(asUser.getAreaId()+","+areaId);
-            }
             if(dept.getIsUsePlatformApp().equals("true")){
                 asUser.setAppName("创享电动车");
                 asUser.setAppId(dept.getAppid());
@@ -391,9 +390,7 @@ public class SysLoginService
                 user.setAppName(dept.getAppName());
                 user.setAppId(dept.getAppid());
             }
-            if(!user.getAreaId().contains(areaId)){
+            user.setAreaId(areaId);
-                user.setAreaId(user.getAreaId()+","+areaId);
-            }
             int i = asUserService.updateUser(user);
         }
 
@@ -435,7 +432,18 @@ public class SysLoginService
         }
         LoginUser loginUser = (LoginUser) authentication.getPrincipal();
         recordAppLoginInfo(loginUser.getUserId());                     //修改sys_user最近登录IP和登录时间
-        // 生成不过期的token
+        // 生成token
-        return tokenService.createNotExpireToken(loginUser);
+        return tokenService.createToken(loginUser);
+    }
+
+    /**
+     * 忘记密码
+     */
+    public int forgetAppPwd(String phone, String phoneCode, String newPassword,String uuid) {
+        AsUser user = asUserService.selectUserByPhoneAndAppId(phone,appId);
+        validateCaptcha(phone, phoneCode, uuid); //校验验证码
+        newPassword = SecurityUtils.encryptPassword(newPassword);
+        asUserService.updateUserPwd(user.getUserId(), newPassword);
+        return 1;
     }
 }

electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java

@@ -2325,6 +2325,7 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
         AsDevice device = asDeviceMapper.selectAsDeviceByMac(asDevice.getMac());
         if(StringUtils.isNotNull(device)){
             device.setSn(asDevice.getSn());
+            device.setHardwareVersionId(asDevice.getHardwareVersionId());
             int i = asDeviceMapper.updateAsDeviceBySn(device);
             if(i>0){
                 log.info("【sn和mac号绑定】===>mac【{}】已经绑定过:更新sn【{}】成功",device.getMac(),device.getSn());

electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java

@@ -800,7 +800,7 @@ public class CallbackServiceImpl implements CallbackService {
         capitalFlow.setOwner(sysDept.getDeptName());
 
         String handlingChargeType = sysDept.getHandlingChargeType();
-        String handlingCharge1 = sysDept.getHandlingCharge();
+        String handlingCharge1 = sysDept.getWithdrawHandlingCharge();
         BigDecimal handlingCharge;
         logger.info("【保存资金流水记录】 获取到配置手续费==============handlingCharge=====================："+handlingCharge1);
         if(handlingChargeType.equals(ServiceConstants.HANDLING_CHARGE_TYPE_PERCENT)){

electripper-system/src/main/java/com/ruoyi/system/service/impl/EtModelServiceImpl.java

@@ -1,38 +1,32 @@
 package com.ruoyi.system.service.impl;
 
-import java.util.List;
-
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.constant.IotConstants;
-import com.ruoyi.common.core.domain.entity.AsUser;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.CommonUtil;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.onenet.ResponseVo;
 import com.ruoyi.common.utils.onenet.Token;
 import com.ruoyi.system.domain.AsDevice;
+import com.ruoyi.system.domain.EtModel;
 import com.ruoyi.system.domain.EtOperatingArea;
 import com.ruoyi.system.mapper.AsDeviceMapper;
+import com.ruoyi.system.mapper.EtModelMapper;
+import com.ruoyi.system.mapper.SysDeptMapper;
 import com.ruoyi.system.service.IAsDeviceService;
+import com.ruoyi.system.service.IEtModelService;
 import com.ruoyi.system.service.IEtOperatingAreaService;
-import com.ruoyi.system.service.ISysDeptService;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.system.mapper.EtModelMapper;
-import com.ruoyi.system.domain.EtModel;
-import com.ruoyi.system.service.IEtModelService;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 车辆型号Service业务层处理
@@ -50,15 +44,15 @@ public class EtModelServiceImpl implements IEtModelService
     @Autowired
     private IAsDeviceService asDeviceService;
 
-    @Autowired
-    private ISysDeptService deptService;
-
     @Resource
     private AsDeviceMapper asDeviceMapper;
 
     @Resource
     private IEtOperatingAreaService etOperatingAreaService;
 
+    @Resource
+    private SysDeptMapper deptMapper;
+
 
     /**
      * 查询车辆型号
@@ -96,10 +90,10 @@ public class EtModelServiceImpl implements IEtModelService
             // 投放数量统计
             AsDevice device = new AsDevice();
             device.setModelId(model.getModelId());
-            List<AsDevice> asDevices = asDeviceService.selectAsDeviceList(device);
+            Integer integer = asDeviceService.selectCountByModelId(model.getModelId());
-            model.setDeviceNum(asDevices.size());
+            model.setDeviceNum(integer);
             // 运营商名称
-            SysDept sysDept = deptService.selectDeptById(model.getOperator());
+            SysDept sysDept = deptMapper.selectDeptById(model.getOperator());
             if(ObjectUtil.isNotNull(sysDept)){
                model.setOperatorName(sysDept.getDeptName());
             }

electripper-system/src/main/java/com/ruoyi/system/service/impl/EtWithdrawServiceImpl.java

@@ -31,7 +31,7 @@ import java.util.List;
 
 
 /**
- * 提现记录Service业务层处理
+ * 提现记录Service业务层处理（废弃）
  *
  * @author 邱贞招
  * @date 2024-06-27
@@ -150,7 +150,7 @@ public class EtWithdrawServiceImpl implements IEtWithdrawService
                 }
                 order.setAreaId(longs.get(0));
                 //记录资金流水
-                callbackService.capitalFlowRecords(order,ServiceConstants.FLOW_TYPE_DISBURSE,ServiceConstants.ORDER_TYPE_WITHDRAW,ServiceConstants.OWNER_TYPE_OPERATOR,null,ServiceConstants.PAY_TYPE_WX);
+//                callbackService.capitalFlowRecords(order,ServiceConstants.FLOW_TYPE_DISBURSE,ServiceConstants.ORDER_TYPE_WITHDRAW,ServiceConstants.OWNER_TYPE_OPERATOR,null,ServiceConstants.PAY_TYPE_WX);
             }
         }
         return etWithdrawMapper.updateEtWithdraw(etWithdraw);

electripper-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="refundNotifyUrl" column="refund_notify_url" />
 		<result property="appUserId" column="app_user_id" />
 		<result property="handlingChargeType" column="handling_charge_type" />
+		<result property="withdrawHandlingCharge" column="withdraw_handling_charge" />
 		<result property="createBy"   column="create_by"   />
 		<result property="createTime" column="create_time" />
 		<result property="updateBy"   column="update_by"   />
@@ -44,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select d.dept_id, d.parent_id, d.ancestors, d.dept_name,
                d.order_num, d.leader, d.phone, d.email, d.status,
                d.del_flag,d.platform_service_fee, d.handling_charge, d.is_profit_sharing, d.separate_account, d.domain, d.is_use_platform_app, d.appid, d.app_name, d.balance, d.app_secret,
-               d.merchant_id, d.api_v3_key, d.notify_url, d.private_key_path,d.merchant_serial_number,d.refund_notify_url, d.app_user_id, d.handling_charge_type,
+               d.merchant_id, d.api_v3_key, d.notify_url, d.private_key_path,d.merchant_serial_number,d.refund_notify_url, d.app_user_id, d.handling_charge_type,withdraw_handling_charge,
                d.create_by, d.create_time
         from sys_dept d
     </sql>
@@ -53,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		SELECT d.dept_id, d.parent_id, d.ancestors, d.dept_name,
 		d.order_num, d.leader, d.phone, d.email, d.status,
 		d.del_flag, d.platform_service_fee, d.handling_charge, d.is_profit_sharing, d.separate_account, d.domain, d.is_use_platform_app, d.appid, d.app_name, d.balance, d.app_secret,
-		d.merchant_id, d.api_v3_key, d.notify_url, d.private_key_path, d.merchant_serial_number, d.refund_notify_url, d.app_user_id,d.handling_charge_type,
+		d.merchant_id, d.api_v3_key, d.notify_url, d.private_key_path, d.merchant_serial_number, d.refund_notify_url, d.app_user_id,d.handling_charge_type,withdraw_handling_charge,
 		u.user_name AS userName,
 		GROUP_CONCAT(oa.area_name SEPARATOR ' | ') AS areaName,
 		d.create_by, d.create_time
@@ -100,7 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
 		select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,d.platform_service_fee, d.handling_charge,
 		       d.is_profit_sharing,d.domain,d.is_use_platform_app, d.appid, d.app_name, d.balance, d.app_secret,d.balance,d.separate_account,
-			   d.merchant_id, d.api_v3_key, d.notify_url, d.private_key_path,d.merchant_serial_number,d.refund_notify_url,d.app_user_id,d.handling_charge_type,
+			   d.merchant_id, d.api_v3_key, d.notify_url, d.private_key_path,d.merchant_serial_number,d.refund_notify_url,d.app_user_id,d.handling_charge_type,withdraw_handling_charge,
 			(select dept_name from sys_dept where dept_id = d.parent_id) parent_name
 		from sys_dept d
 		where d.dept_id = #{deptId}
@@ -109,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectDeptByAppUserId" parameterType="Long" resultMap="SysDeptResult">
 		select d.dept_id, d.parent_id, d.app_user_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,d.platform_service_fee, d.handling_charge,
 			   d.is_profit_sharing,d.domain,d.is_use_platform_app, d.appid, d.app_name, d.balance, d.app_secret,d.balance,d.separate_account,
-			   d.merchant_id, d.api_v3_key, d.notify_url, d.private_key_path,d.merchant_serial_number,d.refund_notify_url,d.app_user_id,d.handling_charge_type,
+			   d.merchant_id, d.api_v3_key, d.notify_url, d.private_key_path,d.merchant_serial_number,d.refund_notify_url,d.app_user_id,d.handling_charge_type,withdraw_handling_charge,
 			   (select dept_name from sys_dept where dept_id = d.parent_id) parent_name
 		from sys_dept d
 		where d.app_user_id = #{appUserId}
@@ -171,6 +172,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="refundNotifyUrl != null and refundNotifyUrl != ''">refund_notify_url,</if>
 		    <if test="appUserId != null and appUserId != ''">app_user_id,</if>
 		    <if test="handlingChargeType != null and handlingChargeType != ''">handling_charge_type,</if>
+		    <if test="withdrawHandlingCharge != null and withdrawHandlingCharge != ''">withdraw_handling_charge,</if>
  			create_time
  		)values(
  			<if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -200,6 +202,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="refundNotifyUrl != null and refundNotifyUrl != ''">#{refundNotifyUrl},</if>
 		    <if test="appUserId != null and appUserId != ''">#{appUserId},</if>
 		    <if test="handlingChargeType != null and handlingChargeType != ''">#{handlingChargeType},</if>
+		    <if test="withdrawHandlingCharge != null and withdrawHandlingCharge != ''">#{withdrawHandlingCharge},</if>
  			sysdate()
  		)
 	</insert>
@@ -233,6 +236,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="refundNotifyUrl != null and refundNotifyUrl != ''">refund_notify_url = #{refundNotifyUrl},</if>
 			<if test="appUserId != null">app_user_id = #{appUserId},</if>
 			<if test="handlingChargeType != null">handling_charge_type = #{handlingChargeType},</if>
+			<if test="withdrawHandlingCharge != null">withdraw_handling_charge = #{withdrawHandlingCharge},</if>
  			update_time = sysdate()
  		</set>
  		where dept_id = #{deptId}