Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserRelationBiz.java

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserPositionChangeRecordDTO.java

+package com.github.wxiaoqi.security.admin.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+/**
+ * 员工变更记录表
+ */
+@Data
+public class AppUserPositionChangeRecordDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    private Integer id;
+
+    /**
+     * 用户id
+     */
+    private String phone;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+    /**
+     * 变更后所在公司ID
+     */
+    private Integer newCompanyId;
+
+    /**
+     * 变更前所在公司ID
+     */
+    private Integer oldCompanyId;
+
+    /**
+     * 变更后所在公司名称
+     */
+    private String newCompanyName;
+
+    /**
+     * 变更前所在公司名称
+     */
+
+    private String oldCompanyName;
+
+    /**
+     * 旧职位ID
+     */
+    private Integer oldJobId;
+
+    /**
+     * 新职位ID
+     */
+    private Integer newJobId;
+
+    /**
+     * 新职位名称
+     */
+    private String newJobName;
+
+    /**
+     * 旧职位名称
+     */
+    private String oldJobName;
+
+    /**
+     * 操作人名称
+     */
+    private Integer operatorId;
+
+    /**
+     * 操作时间
+     */
+    private Timestamp crtTime;
+
+    /**
+     * 状态
+     * 1:入职；2：职位变更；3：身份变更 4：公司所属变更；5离职
+     */
+    private Integer jobRemark;
+
+    /***
+     * 旧身份ID
+     */
+    private Integer oldPositionId;
+
+    /***
+     * 新身份ID
+     */
+    private Integer newPositionId;
+
+    /***
+     * 新身份名称
+     */
+    private String newPositionName;
+
+    /***
+     * 旧身份名称
+     */
+    private String oldPositionName;
+
+    /**
+     * 员工职位、所属公司、离职、入职等的实际上任时间
+     */
+    private Timestamp relTime;
+}

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserPositionTempDTO.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Builder;
 import lombok.Data;
 
+import java.sql.Timestamp;
+
 /**
  * @author libin
  * @version 1.0
@@ -24,7 +26,6 @@ public class AppUserPositionTempDTO {
     @ApiModelProperty(value = "姓名")
     private String name;
 
-
    @ApiModelProperty(value = "身份id")
     private Integer positionId;
 
@@ -37,4 +38,20 @@ public class AppUserPositionTempDTO {
     @ApiModelProperty(value = "分公司")
     private String companyName;
 
+    @ApiModelProperty(value = "变动操作内容")
+    private Integer ChangeStatus;
+
+    @ApiModelProperty(value = "员工职位、所属公司、离职、入职等的实际上任时间")
+    private Timestamp relTime;
+
+    @ApiModelProperty(value = "是否删除：0-正常；1-删除")
+    private Integer isDel;
+
+    @ApiModelProperty(value = "员工职位状态：0-正常；1-离职")
+    private Integer isQuit;
+
+    @ApiModelProperty(value = "用户id")
+    private Integer userId;
+
+
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserPositionChangeRecord.java

+package com.github.wxiaoqi.security.admin.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.util.Date;
+
+/**
+ * 员工变更记录表
+ */
+@Table(name = "app_user_position_change_record")
+@Data
+public class AppUserPositionChangeRecord implements Serializable {
+    private static final long serialVersionUID = 1L;
+    @Id
+    @GeneratedValue(generator = "JDBC")//此处加上注解
+    @ApiModelProperty("主键id")
+    private Integer id;
+
+    @ApiModelProperty("用户id")
+    @Column(name = "phone")
+    private String phone;
+
+    @ApiModelProperty("用户名称")
+    @Column(name = "user_name")
+    private String userName;
+
+    @ApiModelProperty("变更后所在公司ID")
+    @Column(name = "new_company_id")
+    private Integer newCompanyId;
+
+    @ApiModelProperty("变更前所在公司ID")
+    @Column(name = "old_company_id")
+    private Integer oldCompanyId;
+
+    @ApiModelProperty("变更后所在公司名称")
+    @Column(name = "new_company_name")
+    private String newCompanyName;
+
+    @ApiModelProperty("变更前所在公司名称")
+    @Column(name = "old_company_name")
+    private String oldCompanyName;
+
+    @ApiModelProperty("旧职位ID")
+    @Column(name = "old_job_id")
+    private Integer oldJobId;
+
+    @ApiModelProperty("新职位ID")
+    @Column(name = "new_job_id")
+    private Integer newJobId;
+
+    @ApiModelProperty("操作人名称")
+    @Column(name = "operator_id")
+    private Integer operatorId;
+
+    @ApiModelProperty("操作时间")
+    @Column(name = "crt_time")
+    private Timestamp crtTime;
+
+    @ApiModelProperty("员工职位、所属公司、离职、入职等的实际上任时间")
+    @Column(name = "rel_time")
+    private Timestamp relTime;
+
+    @ApiModelProperty("新身份ID")
+    @Column(name = "new_position_id")
+    private Integer newPositionId;
+
+    @ApiModelProperty("旧身份ID")
+    @Column(name = "old_position_id")
+    private Integer oldPositionId;
+
+    @ApiModelProperty("1:入职；2：职位变更；3：身份变更 4：公司所属变更；5离职")
+    @Column(name = "job_remark")
+    private Integer jobRemark;
+
+    @ApiModelProperty("新身份名称")
+    @Column(name = "new_position_name")
+    private String newPositionName;
+
+    @ApiModelProperty("旧身份名称")
+    @Column(name = "old_position_name")
+    private String oldPositionName;
+
+    @ApiModelProperty("新职位名称")
+    @Column(name = "new_job_name")
+    private String newJobName;
+
+    @ApiModelProperty("旧职位名称")
+    @Column(name = "old_job_name")
+    private String oldJobName;
+
+
+
+}

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserPositionTemp.java

@@ -76,4 +76,8 @@ public class AppUserPositionTemp implements Serializable {
     private Integer isDel;
 
 
+    @Column(name = "is_quit")
+    @ApiModelProperty(value = "员工职位状态：0-正常；1-离职")
+    private Integer isQuit;
+
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/BaseUserMemberExport.java

@@ -21,6 +21,8 @@ import java.io.Serializable;
 public class BaseUserMemberExport  implements Serializable {
     private static final long serialVersionUID = 1L;
     private Integer id;
+    @Column(name = "user_id")
+    private Integer userId;
     private String username;
     @Column(name = "member_level")
     private Integer memberLevel;

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/MyWalletCath.java

 package com.github.wxiaoqi.security.admin.entity;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-import javax.persistence.*;
-
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
 
 /**
  * 钱包提现表
@@ -134,4 +137,7 @@ public class MyWalletCath implements Serializable {
     @Column(name = "offline_way")
     @ApiModelProperty(value = "线下提现方式 1:自动 2:手动")
     private Integer offlineWay;
+
+    @Column(name = "real_reason")
+    private String realReason;
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java

@@ -5,7 +5,6 @@ import com.github.wxiaoqi.security.admin.bo.UserStaffBo;
 import com.github.wxiaoqi.security.admin.dto.AppUserSellingWaterDTO;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
-import com.github.wxiaoqi.security.admin.entity.AppUserPosition;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMember;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
@@ -162,7 +161,8 @@ public interface UserFeign {
     public ObjectRestResponse<Void> withDrawprocess(@RequestParam(value = "orderNo") String orderNo,
                                                     @RequestParam(value = "cono",required = false) String cono,
                                                     @RequestParam(value = "reason",required = false) String reason,
-                                                    @RequestParam(value = "isSuccess") Boolean isSuccess);
+                                                    @RequestParam(value = "isSuccess") Boolean isSuccess,
+                                                    @RequestParam(value = "realReason",required = false) String realReason);
 
     @GetMapping("/app/user/collect/exist")
     boolean isCollectionByTypeAndTypeId(@RequestParam("userId") Integer userId,

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/AppUserPositionTempVo.java

@@ -51,4 +51,7 @@ public class AppUserPositionTempVo {
 
     @ApiModelProperty(value = "分公司名称")
     private String companyName;
+
+  @ApiModelProperty(value = "员工职位状态 0：在职 1：离职")
+    private Integer idQuit;
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserAlipayBiz.java

@@ -4,6 +4,8 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.admin.entity.AppUserAlipay;
+import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
+import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.mapper.AppUserAlipayMapper;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
@@ -94,16 +96,16 @@ public class AppUserAlipayBiz extends BaseBiz<AppUserAlipayMapper, AppUserAlipay
             appUserAlipays.add(appUserAlipay);
         }
         //微信
-//        AppUserLogin appUserLogin = appUserLoginBiz.getUserById(userId);
-//        if(appUserLogin != null && StringUtils.isNotBlank(appUserLogin.getWxOpenid())) {
-//            AppUserDetail appUserDetail = appUserDetailBiz.getUserByUserid(userId);
-//            AppUserAlipay wxAppUser = new AppUserAlipay();
-//            wxAppUser.setType(2);
-//            wxAppUser.setUserId(userId);
-//            wxAppUser.setNickname(StringUtils.isEmpty(appUserDetail.getWxNickname())?appUserDetail.getNickname():appUserDetail.getWxNickname());
-//            wxAppUser.setTxAlipay(appUserLogin.getWxOpenid());
-//            appUserAlipays.add(wxAppUser);
-//        }
+        AppUserLogin appUserLogin = appUserLoginBiz.getUserById(userId);
+        if(appUserLogin != null && StringUtils.isNotBlank(appUserLogin.getWxOpenid())) {
+            AppUserDetail appUserDetail = appUserDetailBiz.getUserByUserid(userId);
+            AppUserAlipay wxAppUser = new AppUserAlipay();
+            wxAppUser.setType(0);
+            wxAppUser.setUserId(userId);
+            wxAppUser.setNickname(StringUtils.isEmpty(appUserDetail.getWxNickname())?appUserDetail.getNickname():appUserDetail.getWxNickname());
+            wxAppUser.setTxAlipay(appUserLogin.getWxOpenid());
+            appUserAlipays.add(wxAppUser);
+        }
         return appUserAlipays;
     }
 

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionChangeRecordBiz.java

+package com.github.wxiaoqi.security.admin.biz;
+
+
+import com.alibaba.druid.sql.visitor.functions.If;
+import com.github.wxiaoqi.security.admin.dto.AppUserPositionChangeRecordDTO;
+import com.github.wxiaoqi.security.admin.dto.AppUserPositionTempDTO;
+import com.github.wxiaoqi.security.admin.entity.AppUserPosition;
+import com.github.wxiaoqi.security.admin.entity.AppUserPositionChangeRecord;
+import com.github.wxiaoqi.security.admin.entity.AppUserPositionTemp;
+import com.github.wxiaoqi.security.admin.mapper.AppUserPositionChangeRecordMapper;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import org.apache.commons.lang3.StringUtils;
+import org.jsoup.select.Evaluator;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.entity.Example;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Transactional
+@Service("appUserPositionChangeRecordBiz")
+public class AppUserPositionChangeRecordBiz extends BaseBiz<AppUserPositionChangeRecordMapper, AppUserPositionChangeRecord> {
+
+
+    @Autowired
+    private AppUserPositionBiz appUserPositionBiz;
+
+    @Autowired
+    private AppUserJobLevelBiz appUserJobLevelBiz;
+
+    public static final int USER_ADD_COMPANY = 1;
+    public static final int JOB_CHANGE = 2;
+    public static final int POSITION_CHANGE = 3;
+    public static final int COMPANY_CHANGE = 4;
+    public static final int USER_LEAVE_COMPANT = 5;
+    public static final int USER_AND_ADD_COMPANY=6;
+
+    /**
+     * 变更记录表插入
+     *
+     * @param userPositionTemp
+     */
+    public void addPositionChangeRecord(AppUserPositionTemp userPositionTemp, AppUserPositionTemp oldData, Integer operatorId, Timestamp relTime) {
+        AppUserPositionChangeRecord appUserPositionChangeRecord = new AppUserPositionChangeRecord();
+
+        if (!(userPositionTemp.getIsQuit().equals(oldData.getIsQuit()))) {
+            appUserPositionChangeRecord.setJobRemark(USER_LEAVE_COMPANT);
+        }
+
+        //状态1：职位变动
+        if (!(userPositionTemp.getJobId().equals(oldData.getJobId()))) {
+            appUserPositionChangeRecord.setOldJobId(oldData.getJobId());
+            appUserPositionChangeRecord.setNewJobId(userPositionTemp.getJobId());
+            appUserPositionChangeRecord.setJobRemark(JOB_CHANGE);
+            findUserJobName(appUserPositionChangeRecord);
+        }
+        //状态2：身份变动
+        if (!(userPositionTemp.getPositionId().equals(oldData.getPositionId()))) {
+            appUserPositionChangeRecord.setOldPositionId(oldData.getPositionId());
+            appUserPositionChangeRecord.setNewPositionId(userPositionTemp.getPositionId());
+            appUserPositionChangeRecord.setJobRemark(POSITION_CHANGE);
+            findUserPositionName(appUserPositionChangeRecord);
+        }
+        //状态3：公司变动调整
+        if (!(userPositionTemp.getCompanyId().equals(oldData.getCompanyId()))) {
+            appUserPositionChangeRecord.setOldCompanyId(oldData.getCompanyId());
+            appUserPositionChangeRecord.setOldCompanyName(oldData.getCompanyName());
+            appUserPositionChangeRecord.setNewCompanyId(userPositionTemp.getCompanyId());
+            appUserPositionChangeRecord.setNewCompanyName(userPositionTemp.getCompanyName());
+            appUserPositionChangeRecord.setJobRemark(COMPANY_CHANGE);
+        }
+
+        appUserPositionChangeRecord.setPhone(userPositionTemp.getPhone());
+        appUserPositionChangeRecord.setRelTime(relTime);
+        appUserPositionChangeRecord.setUserName(userPositionTemp.getName());
+        appUserPositionChangeRecord.setCrtTime(new Timestamp(System.currentTimeMillis()));
+        appUserPositionChangeRecord.setOperatorId(operatorId);
+        mapper.insert(appUserPositionChangeRecord);
+    }
+
+    /**
+     * 入职时插入记录表
+     *
+     * @param userPositionTemp
+     * @param updUserId
+     */
+    public void addJoinJobRecord(AppUserPositionTempDTO userPositionTemp, Integer updUserId) {
+        AppUserPositionChangeRecord appUserPositionChangeRecord = new AppUserPositionChangeRecord();
+        appUserPositionChangeRecord.setPhone(userPositionTemp.getPhone());
+        appUserPositionChangeRecord.setUserName(userPositionTemp.getName());
+        appUserPositionChangeRecord.setRelTime(userPositionTemp.getRelTime());
+        appUserPositionChangeRecord.setCrtTime(new Timestamp(System.currentTimeMillis()));
+        appUserPositionChangeRecord.setJobRemark(USER_ADD_COMPANY);
+        appUserPositionChangeRecord.setOperatorId(updUserId);
+        mapper.insert(appUserPositionChangeRecord);
+    }
+
+    /**
+     * 员工复职
+     * @param userPositionTemp
+     * @param updUserId
+     */
+    public void andAddJoinJobRecord(AppUserPositionTempDTO userPositionTemp, Integer updUserId) {
+        AppUserPositionChangeRecord appUserPositionChangeRecord = new AppUserPositionChangeRecord();
+        appUserPositionChangeRecord.setPhone(userPositionTemp.getPhone());
+        appUserPositionChangeRecord.setUserName(userPositionTemp.getName());
+        appUserPositionChangeRecord.setRelTime(userPositionTemp.getRelTime());
+        appUserPositionChangeRecord.setCrtTime(new Timestamp(System.currentTimeMillis()));
+        appUserPositionChangeRecord.setJobRemark(USER_AND_ADD_COMPANY);
+        appUserPositionChangeRecord.setOperatorId(updUserId);
+        mapper.insert(appUserPositionChangeRecord);
+    }
+
+
+
+
+
+
+    /**
+     * 查询新旧职位名称
+     * zyh
+     *
+     * @param appUserPositionChangeRecord
+     * @return
+     */
+
+    public AppUserPositionChangeRecord findUserJobName(AppUserPositionChangeRecord appUserPositionChangeRecord) {
+        appUserPositionChangeRecord.setNewJobName(appUserJobLevelBiz.selectById(appUserPositionChangeRecord.getNewJobId()).getName());
+        appUserPositionChangeRecord.setOldJobName(appUserJobLevelBiz.selectById(appUserPositionChangeRecord.getOldJobId()).getName());
+        return appUserPositionChangeRecord;
+    }
+
+    /**
+     * 查询新旧身份名称
+     * zyh
+     *
+     * @param appUserPositionChangeRecord
+     * @return
+     */
+    public AppUserPositionChangeRecord findUserPositionName(AppUserPositionChangeRecord appUserPositionChangeRecord) {
+        appUserPositionChangeRecord.setOldPositionName(appUserPositionBiz.selectById(appUserPositionChangeRecord.getOldPositionId()).getName());
+        appUserPositionChangeRecord.setNewPositionName(appUserPositionBiz.selectById(appUserPositionChangeRecord.getNewPositionId()).getName());
+        return appUserPositionChangeRecord;
+    }
+
+
+    /**
+     * 查询员工信息变更记录表
+     */
+    public List<AppUserPositionChangeRecordDTO> findPositionChangeRecord(AppUserPositionTemp userPositionTemp) {
+        Example example = new Example(AppUserPositionChangeRecord.class);
+        example.createCriteria().andEqualTo("phone", userPositionTemp.getPhone());
+        List<AppUserPositionChangeRecord> list = selectByExample(example);
+        List<AppUserPositionChangeRecordDTO> listAppUserPositionChangeRecordDTO = new ArrayList<>();
+        list.stream().forEach(x -> {
+            AppUserPositionChangeRecordDTO appUserPositionChangeRecordDTO = new AppUserPositionChangeRecordDTO();
+            BeanUtils.copyProperties(x, appUserPositionChangeRecordDTO);
+            listAppUserPositionChangeRecordDTO.add(appUserPositionChangeRecordDTO);
+        });
+        return listAppUserPositionChangeRecordDTO;
+    }
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserRelationBiz.java

@@ -11,7 +11,6 @@ import com.github.wxiaoqi.security.admin.vo.InviteMemberVo;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
-import com.sun.corba.se.impl.orbutil.concurrent.Sync;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
@@ -61,25 +60,6 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper, AppUserRe
     @Autowired
     private  AppStaffUserBiz staffUserBiz;
 
-    private static final HashMap<Integer, Boolean> map =  new HashMap<>();
-    private static final Object obj = new Object();
-
-    private boolean lock(Integer userId) {
-        synchronized (obj) {
-            if (map.get(userId) == null) {
-                map.put(userId, true);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private void unLock(Integer userId) {
-        synchronized (obj) {
-            map.remove(userId);
-        }
-    }
-
     /**
      * 关系绑定
      * 规则A->B (B无有效上线+无有效下线)
@@ -95,6 +75,7 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper, AppUserRe
             }
 
        /* AppUserVo appUserVo=userDetailBiz.getUserInfoById(userId);
+
         if (appUserVo==null){
             log.info("----userId==="+userId+"----parentId===="+parentId+"----该用户不存在");
             return;
@@ -104,48 +85,44 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper, AppUserRe
                 log.info("----userId==="+userId+"----parentId===="+parentId+"----该上线用户不存在");
                 return;
             }
-            if (lock(userId)) {
-                AppUserRelation relation = getMyBiz().getRelationByUserId(parentId);
-                Long time = System.currentTimeMillis();
-                if (relation == null) {
-                    relation = new AppUserRelation();
+            AppUserRelation relation=getMyBiz().getRelationByUserId(parentId);
+            Long time=System.currentTimeMillis();
+            if(relation==null){
+                relation=new AppUserRelation();
                 relation.setUserId(parentId);
                 relation.setBindType(type);
                 insertSelective(relation);
             }
-                Long bindTime = time - validTime;
+            Long bindTime=time-validTime;
             //判断用户是否有有效的下线
-                if (getCountByParentId(userId, bindTime) == 0L) {
-                    relation = getMyBiz().getRelationByUserId(userId);
-                    if (relation == null) {
-                        relation = new AppUserRelation();
+            if (getCountByParentId(userId,bindTime)==0L){
+                relation=getMyBiz().getRelationByUserId(userId);
+                if(relation==null){
+                    relation=new AppUserRelation();
                     relation.setUserId(userId);
                     relation.setParentId(parentId);
                     relation.setBindType(type);
                     relation.setBindTime(time);
                     insertSelective(relation);
-                        if (relation != null) {
-                            AppStaffUserDTO staffUserDTO = new AppStaffUserDTO();
-                            staffUserDTO.setSuId(relation.getParentId());
-                            staffUserDTO.setUid(relation.getUserId());
-                            staffUserBiz.addAppStaffUser(staffUserDTO);
-                        }
-                    } else {
+                }else {
                     //判断用户是否有有效的上线
-                        log.info("----userId===" + userId + "----bindTime====" + bindTime + "----relation.getBindTime()===" + relation.getBindTime());
-                        if (relation.getParentId() == null || relation.getParentId() == 0 || (relation.getIsForever() != 1 && validTime > 0 && relation.getBindTime() < bindTime)) {
+                    log.info("----userId==="+userId+"----bindTime===="+bindTime+"----relation.getBindTime()==="+relation.getBindTime());
+                    if(relation.getParentId()==null||relation.getParentId()==0||(relation.getIsForever()!=1&&validTime>0&&relation.getBindTime()<bindTime)){
                         relation.setParentId(parentId);
                         relation.setBindType(type);
                         relation.setBindTime(time);
                         getMyBiz().updRelation(relation);
                     }
                 }
+                if (relation != null){
+                    AppStaffUserDTO staffUserDTO=new AppStaffUserDTO();
+                    staffUserDTO.setSuId(relation.getParentId());
+                    staffUserDTO.setUid(relation.getUserId());
+                    staffUserBiz.addAppStaffUser(staffUserDTO);
                 }
             }
         }catch (Exception e){
             log.info("网络异常===" + e.getMessage());
-        }finally {
-            unLock(userId);
         }
 
     }
@@ -253,8 +230,8 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper, AppUserRe
         relationTemp.setIsValid(0);
         relationTemp.setType(1);
         relationTemp.setIsDel(0);
-        relationTemp=relationTempBiz.selectOne(relationTemp);
-        if(relationTemp==null){
+        relationTemp = relationTempBiz.selectOne(relationTemp);
+        if (relationTemp == null) {
             return;
         }
         Integer parentId = relationTemp.getUserId();

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberExportBiz.java

@@ -77,6 +77,7 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
                     throw new BaseException(e);
                 }
             }
+            boolean hasUsed = phoneAndUserIdMap == null ? false : (phoneAndUserIdMap.get(userMemberSaveDTO.getPhone()) == null ? false : true);
             BaseUserMemberExport memberExport = BaseUserMemberExport
                     .builder()
                     .username(userMemberSaveDTO.getPhone())
@@ -85,7 +86,8 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
                     .rentFreeDays(userMemberSaveDTO.getRentFreeDays())
                     .memberName(userMemberSaveDTO.getMemberName())
                     .discount(level == null ? 0 : level.getDiscount() == null ? 0 : level.getDiscount())
-                    .status(phoneAndUserIdMap == null ? 0 : (phoneAndUserIdMap.get(userMemberSaveDTO.getPhone()) == null ? 0 : 1))
+                    .status(hasUsed?1:0)
+                    .userId(hasUsed?phoneAndUserIdMap.get(userMemberSaveDTO.getPhone()):null)
                     .crtId(userId)
                     .crtName(name)
                     .crtTime(Instant.now().toEpochMilli())
@@ -178,6 +180,7 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
                     throw new BaseException(e);
                 }*/
             }
+            boolean hasUsed = phoneAndUserIdMap == null ? false : (phoneAndUserIdMap.get(phone) == null ? false : true);
             BaseUserMemberExport memberExport = BaseUserMemberExport
                     .builder()
                     .username(phone.trim())
@@ -185,7 +188,8 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
                     .totalNumber(Integer.valueOf(totalNumber))
                     .rentFreeDays(Integer.valueOf(rentFreeDays))
                     .discount(discount)
-                    .status(phoneAndUserIdMap == null ? 0 : (phoneAndUserIdMap.get(phone) == null ? 0 : 1))
+                    .status(hasUsed?1:0)
+                    .userId(hasUsed?phoneAndUserIdMap.get(phone):null)
                     .crtId(userId)
                     .memberName(memberName)
                     .crtName(userName)
@@ -226,8 +230,8 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
     }
 
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public void updateUserMemberExportDataToLoseEfficacyByPhone(String phone) {
-        mapper.updateUserMemberExportDataToLoseEfficacyByPhone(phone);
+    public void updateUserMemberExportDataToLoseEfficacyByPhone(String phone,Integer userId) {
+        mapper.updateUserMemberExportDataToLoseEfficacyByPhone(phone,userId);
     }
 
     public PageDataVO<BaseUserMemberExportVo> findUserMemberExportDataPage(BaseUserMemberExportDataFindDTO exportDataFindDTO) {

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/MyWalletBiz.java

@@ -366,7 +366,7 @@ public class MyWalletBiz extends BaseBiz<MyWalletMapper, MyWallet> implements In
             HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
             String host = StringUtils.defaultIfBlank(request.getHeader("userHost"), ClientUtil.getClientIp(request));
             FundPayVo fundPayVo = FundPayVo.builder()
-                    .amount(applyCathVo.getCathType() == 0 ? String.valueOf(realAmount.multiply(new BigDecimal(100)).doubleValue()) : String.format("%.2f", realAmount.doubleValue()))
+                    .amount(applyCathVo.getCathType() == 0 ? String.format("%.0f",realAmount.multiply(new BigDecimal(100)).doubleValue()) : String.format("%.2f", realAmount.doubleValue()))
                     .orderNo(orderNo)
                     .payeeAccount(applyCathVo.getAccountNumber())
                     .payerShowName("欣新房车网络科技（广东）股份有限公司")
@@ -408,13 +408,13 @@ public class MyWalletBiz extends BaseBiz<MyWalletMapper, MyWallet> implements In
             BigDecimal commission = cath.getCommission();
             if (status == WithDrawStatusEnum.AGREE.getCode()) {
                 if(org.springframework.util.StringUtils.hasText(payMentNo)){
-                  withDrawProcess(cath.getOrderNo(),payMentNo,null,true);
+                  withDrawProcess(cath.getOrderNo(),payMentNo,null,null,true);
                 }else {
                     HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
                     String host = StringUtils.defaultIfBlank(request.getHeader("userHost"), ClientUtil.getClientIp(request));
                     String cono = OrderUtil.GetOrderNumber("");
                     FundPayVo fundPayVo = FundPayVo.builder()
-                            .amount(cath.getCathType() == 0 ? String.valueOf(cath.getRealAmount().multiply(new BigDecimal(100)).doubleValue()) : String.format("%.2f", cath.getRealAmount().doubleValue()))
+                            .amount(cath.getCathType() == 0 ? String.format("%.0f",cath.getRealAmount().multiply(new BigDecimal(100)).doubleValue()) : String.format("%.2f", cath.getRealAmount().doubleValue()))
                             .payeeAccount(cath.getAccountNumber())
                             .orderNo(cono)
                             .payerShowName("欣新房车网络科技（广东）股份有限公司")
@@ -425,9 +425,9 @@ public class MyWalletBiz extends BaseBiz<MyWalletMapper, MyWallet> implements In
 
                     ObjectRestResponse<String> response = thirdFeign.transferAccount(fundPayVo);
                     if (response.getStatus() == 200){
-                        withDrawProcess(cath.getOrderNo(),response.getData(),"",true);
+                        withDrawProcess(cath.getOrderNo(),response.getData(),null,null,true);
                     }else {
-                        withDrawProcess(cath.getOrderNo(),response.getData(),response.getMessage(),false);
+                        withDrawProcess(cath.getOrderNo(),response.getData(),response.getMessage(),response.getMessage(),false);
                     }
 
                     log.info("发送提现消息成功：【{}】", fundPayVo);
@@ -483,7 +483,7 @@ public class MyWalletBiz extends BaseBiz<MyWalletMapper, MyWallet> implements In
         return payAccountVos;
     }
 
-    public void withDrawProcess(String orderNo, String cono, String reason, Boolean isSuccess) {
+    public void withDrawProcess(String orderNo, String cono, String reason, String realReason,Boolean isSuccess) {
         MyWalletCath myWalletCath = myWalletCathBiz.findWalletCatchByOrderNo(orderNo);
         BigDecimal balnece = myWalletCath.getBalance();
         myWalletCath.setCono(cono);
@@ -510,6 +510,7 @@ public class MyWalletBiz extends BaseBiz<MyWalletMapper, MyWallet> implements In
                 wallet.setUserId(myWalletCath.getUserId());
                 wallet = selectOne(wallet);
                 myWalletCath.setReason(reason);
+                myWalletCath.setRealReason(realReason);
                 myWalletCath.setStauts(WithDrawStatusEnum.FAIL.getCode());
                 BigDecimal amount = myWalletCath.getRealAmount().add(myWalletCath.getCommission());
                 BigDecimal balance = wallet.getBalance().add(amount);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserPositionChangeRecordMapper.java

+package com.github.wxiaoqi.security.admin.mapper;
+
+import com.github.wxiaoqi.security.admin.entity.AppUserPositionChangeRecord;
+import tk.mybatis.mapper.common.Mapper;
+
+public interface AppUserPositionChangeRecordMapper extends Mapper<AppUserPositionChangeRecord> {
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/BaseUserMemberExportMapper.java

@@ -18,7 +18,7 @@ import java.util.List;
 public interface BaseUserMemberExportMapper extends Mapper<BaseUserMemberExport>, InsertListMapper<BaseUserMemberExport> {
 
 
-    void updateUserMemberExportDataToLoseEfficacyByPhone(@Param("phone") String phone);
+    void updateUserMemberExportDataToLoseEfficacyByPhone(@Param("phone") String phone,@Param("userId") Integer userId);
 
     List<BaseUserMemberExportDTO> findExportDataPage(BaseUserMemberExportDataFindDTO exportDataFindDTO);
 

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/MyWalletController.java

@@ -143,8 +143,9 @@ public class MyWalletController {
     public ObjectRestResponse<Void> withDrawprocess(@RequestParam(value = "orderNo") String orderNo,
                                                     @RequestParam(value = "cono", required = false) String cono,
                                                     @RequestParam(value = "reason", required = false) String reason,
-                                                    @RequestParam(value = "isSuccess") Boolean isSuccess) {
-        myWalletBiz.withDrawProcess(orderNo, cono, reason, isSuccess);
+                                                    @RequestParam(value = "isSuccess") Boolean isSuccess,
+                                                    @RequestParam(value = "realReason",required = false) String realReason) {
+        myWalletBiz.withDrawProcess(orderNo, cono, reason,realReason,isSuccess);
         return ObjectRestResponse.succ();
     }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/AppUserPositionController.java

@@ -6,15 +6,22 @@ import com.github.wxiaoqi.security.admin.biz.AppUserPositionTempBiz;
 import com.github.wxiaoqi.security.admin.dto.AppUserPositionTempDTO;
 import com.github.wxiaoqi.security.admin.dto.AppUserPositionTempFindDTO;
 import com.github.wxiaoqi.security.admin.dto.UserPostionDTO;
+import com.github.wxiaoqi.security.admin.entity.AppUserPositionTemp;
 import com.github.wxiaoqi.security.admin.vo.AppUserPositionTempVo;
 import com.github.wxiaoqi.security.admin.vo.WalletPostionVo;
+import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
+import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
+import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
+import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.excel.ExcelImport;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
@@ -24,6 +31,7 @@ import java.util.Map;
  * @description
  * @data 2019/7/17 16:13
  */
+@Slf4j
 @RestController
 @RequestMapping("/postion/admin")
 public class AppUserPositionController {
@@ -37,6 +45,13 @@ public class AppUserPositionController {
     @Autowired
     private AppUserPositionTempBiz appUserPositionTempBiz;
 
+    @Autowired
+    private UserAuthUtil userAuthUtil;
+
+    @Autowired
+    private UserAuthConfig userAuthConfig;
+
+
     @GetMapping("/jobs")
     public ObjectRestResponse findAllJobs() {
         return ObjectRestResponse.succ(jobLevelBiz.selectListAll());
@@ -57,59 +72,119 @@ public class AppUserPositionController {
 
     /**
      * 新增或编辑身份信息
+     *
      * @return
      */
     @PostMapping("/addUserPostion")
-    public ObjectRestResponse<Void> addUserPostion(@RequestBody AppUserPositionTempDTO appUserPositionTempDTO){
-        return appUserPositionTempBiz.add(appUserPositionTempDTO);
+    public ObjectRestResponse<Void> addUserPostion(@RequestBody AppUserPositionTempDTO appUserPositionTempDTO, HttpServletRequest request) {
+        try {
+            IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
+            Integer s = Integer.valueOf(infoFromToken.getId());
+            return appUserPositionTempBiz.add(appUserPositionTempDTO, Integer.valueOf(infoFromToken.getId()));
+        } catch (Exception e) {
+            log.error("新增失败【{}】", e);
+            throw new BaseException("新增失败");
+        }
     }
 
     /**
      * 新增或编辑身份信息
+     *
      * @return
      */
     @PostMapping("/updUserPostion")
-    public ObjectRestResponse<Void> updUserPostion(@RequestBody AppUserPositionTempDTO appUserPositionTempDTO){
+    public ObjectRestResponse<Void> updUserPostion(@RequestBody AppUserPositionTempDTO appUserPositionTempDTO, HttpServletRequest request) {
+        try {
+            IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
+            return appUserPositionTempBiz.add(appUserPositionTempDTO, Integer.valueOf(infoFromToken.getId()));
+        } catch (Exception e) {
+            log.error("修改失败【{}】", e);
+            throw new BaseException("修改失败");
+        }
+    }
+
+    /**
+     * 员工信息更改,并插入变更记录表
+     * zuoyh
+     *
+     * @return
+     */
+    @PostMapping("/updUserChange")
+    public ObjectRestResponse<Void> updUserChange(@RequestBody AppUserPositionTempDTO appUserPositionTempDTO, HttpServletRequest request) {
+        try {
+            IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
+            Integer operatorId = Integer.valueOf(infoFromToken.getId());
+            appUserPositionTempBiz.addUserPositionChangeRecord(appUserPositionTempDTO.getChangeStatus(), appUserPositionTempDTO, operatorId);
+            return ObjectRestResponse.succ();
+        } catch (Exception e) {
+            log.error("修改失败【{}】", e);
+            throw new BaseException("修改失败");
+        }
+
+    }
+
+    /**
+     * 查询员工信息变更记录表
+     */
+    @GetMapping("/findPositionChangeRecord")
+    public ObjectRestResponse findPositionChangeRecord(AppUserPositionTemp appUserPositionTemp) {
+        return ObjectRestResponse.succ(appUserPositionTempBiz.findPositionChangeRecord(appUserPositionTemp));
+    }
 
-        return appUserPositionTempBiz.add(appUserPositionTempDTO);
+    /**
+     * 员工复职位
+     */
+    @GetMapping("/updAddPositionChangeRecord")
+    public ObjectRestResponse updAddPositionChangeRecord(@RequestBody AppUserPositionTempDTO appUserPositionTempDTO, HttpServletRequest request) {
+        try {
+            IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
+            Integer operatorId = Integer.valueOf(infoFromToken.getId());
+            appUserPositionTempBiz.andAddUserPositionChangeRecord(appUserPositionTempDTO,operatorId);
+            return ObjectRestResponse.succ();
+        } catch (Exception e) {
+            log.error("修改失败【{}】", e);
+            throw new BaseException("修改失败");
+        }
     }
 
     /**
      * 批量导入
+     *
      * @param userPostionExcel
      * @return
      */
     @PostMapping("/excel/import")
-    public ObjectRestResponse<Map<String,Object>> importUserPostion(@RequestPart("file") MultipartFile userPostionExcel) {
+    public ObjectRestResponse<Map<String, Object>> importUserPostion(@RequestPart("file") MultipartFile userPostionExcel) {
         List<String[]> userPostionData = ExcelImport.getExcelData(userPostionExcel);
         if (userPostionData.size() < 2) {
             return ObjectRestResponse.createFailedResult(1001, "导入不能没数据！！！");
         }
         userPostionData.remove(0);
-        Map<String,Object> result = appUserPositionTempBiz.importUserPostion(userPostionData);
+        Map<String, Object> result = appUserPositionTempBiz.importUserPostion(userPostionData);
         return ObjectRestResponse.succ(result);
     }
 
     /**
      * 删除
+     *
      * @param id
      * @return
      */
     @DeleteMapping("/{id}")
-    public ObjectRestResponse<Void> deleteUserPostion(@PathVariable(value = "id") Integer id){
-        appUserPositionTempBiz.updateAppuserPostionStatusById(id,1);
+    public ObjectRestResponse<Void> deleteUserPostion(@PathVariable(value = "id") Integer id) {
+        appUserPositionTempBiz.updateAppuserPostionStatusById(id, 1);
         return ObjectRestResponse.succ();
     }
 
     @PostMapping("/page")
-    public ObjectRestResponse<PageDataVO<AppUserPositionTempVo>> findWithPage(@RequestBody AppUserPositionTempFindDTO appUserPositionTempFindDTO){
+    public ObjectRestResponse<PageDataVO<AppUserPositionTempVo>> findWithPage(@RequestBody AppUserPositionTempFindDTO appUserPositionTempFindDTO) {
         PageDataVO<AppUserPositionTempVo> dataVO = appUserPositionTempBiz.findWithPage(appUserPositionTempFindDTO);
         return ObjectRestResponse.succ(dataVO);
     }
 
 
     @GetMapping("/userid")
-    public List<Integer> getUserIdByParentCompany(@RequestParam("parentCompanyId") List<Integer> parentCompanyId){
+    public List<Integer> getUserIdByParentCompany(@RequestParam("parentCompanyId") List<Integer> parentCompanyId) {
         return appUserPositionTempBiz.getUserIdByParentCompany(parentCompanyId);
     }
 

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -1098,7 +1098,7 @@ public class AppPermissionService {
         List<BaseUserMemberExportDTO> memberExportDTOS = baseUserMemberExportBiz.findUserMemberExportDataByPhoneAndHashEffective(phone);
         if (CollectionUtils.isNotEmpty(memberExportDTOS)) {
             insertUserMemberByExistUserMemberExportData(userId, memberExportDTOS);
-            baseUserMemberExportBiz.updateUserMemberExportDataToLoseEfficacyByPhone(phone);
+            baseUserMemberExportBiz.updateUserMemberExportDataToLoseEfficacyByPhone(phone,userId);
         }
     }
 

ace-modules/ace-admin/src/main/resources/mapper/BaseUserMemberExportMapper.xml

@@ -13,10 +13,11 @@
         <result property="crtId" column="crt_id"/>
         <result property="crtName" column="crt_name"/>
         <result property="crtTime" column="crt_time"/>
+        <result property="userId" column="user_id"/>
     </resultMap>
 
     <update id="updateUserMemberExportDataToLoseEfficacyByPhone">
-        update `base_user_member_export` set `status`=1 where `username`=#{phone}
+        update `base_user_member_export` set `status`=1,`user_id`=#{userId} where `username`=#{phone}
     </update>
 
     <select id="findExportDataPage" resultType="com.github.wxiaoqi.security.admin.dto.BaseUserMemberExportDTO">

ace-modules/ace-admin/src/main/resources/mapper/MyWalletCathMapper.xml

@@ -24,7 +24,6 @@
         (SELECT * FROM `my_wallet_cath` WHERE 1 = 1
         <if test="state != null">
             AND `stauts`=#{state}
-            i
         </if>
         <if test="orderNo !=null and orderNo !=''">
             AND `order_no` = #{orderNo}

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/pay/NotifyUrlDTO.java

@@ -9,6 +9,9 @@ public class NotifyUrlDTO {
     public static final int TYPE_APP = 1;
     public static final int TYPE_WX = 2;
 
+    public static final int PAY_WAY_WX = 1;
+    public static final int PAY_WAY_ALI = 2;
+
     //订单号
     @ApiModelProperty(value = "订单号")
     private String orderNo;

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

@@ -173,11 +173,11 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 		if (orderPageVo == null) {
 			return ObjectRestResponse.createFailedResult(ResCode.ORDER_IS_NOT_EXIST.getCode(), ResCode.ORDER_IS_NOT_EXIST.getDesc());
 		}
-        if(orderPageVo.getStatus() <= 3 && orderPageVo.getStatus() != 2 && orderPageVo.getStatus() != -1) {
+		if (orderPageVo.getStatus() <= 3 && orderPageVo.getStatus() != 2 && orderPageVo.getStatus() != -1) {
 			return ObjectRestResponse.createFailedResult(ResCode.ORDER_DETAIL_IS_NOT_EXIST.getCode(), ResCode.ORDER_DETAIL_IS_NOT_EXIST.getDesc());
 		}
 		AppUserDTO appUserVo = userFeign.userDetailById(orderPageVo.getUserId()).getData();
-        if(appUserVo != null) {
+		if (appUserVo != null) {
 			orderPageVo.setTelephone(appUserVo.getUsername());
 			orderPageVo.setUsername(appUserVo.getRealname());
 		}
@@ -189,7 +189,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 			if (!companyIds.contains(orderPageVo.getOrderRentVehicleDetail().getStartCompanyId()) && !companyIds.contains(orderPageVo.getOrderRentVehicleDetail().getEndCompanyId())) {
 				return ObjectRestResponse.createFailedResult(ResCode.YOU_AUTH_FAIL.getCode(), ResCode.YOU_AUTH_FAIL.getDesc());
 			}
-            if(userDTO.getCompanyId() == orderPageVo.getOrderRentVehicleDetail().getEndCompanyId()) {
+			if (userDTO.getCompanyId() == orderPageVo.getOrderRentVehicleDetail().getEndCompanyId()) {
 				orderPageVo.setUserCompanyStatus(true);
 			}
 			if (orderPageVo.getStatus() == 4) { //未交车
@@ -238,6 +238,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 
 	/**
 	 * 后台获取订单详情
+	 *
 	 * @param no
 	 * @param userDTO
 	 * @return
@@ -248,7 +249,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 			return ObjectRestResponse.createFailedResult(ResCode.ORDER_IS_NOT_EXIST.getCode(), ResCode.ORDER_IS_NOT_EXIST.getDesc());
 		}
 		AppUserDTO appUserVo = userFeign.userDetailById(orderPageVo.getUserId()).getData();
-		if(appUserVo != null) {
+		if (appUserVo != null) {
 			orderPageVo.setTelephone(appUserVo.getUsername());
 			orderPageVo.setUsername(appUserVo.getRealname());
 			orderPageVo.setPositionName(appUserVo.getPositionName());
@@ -261,7 +262,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 			if (!companyIds.contains(orderPageVo.getOrderRentVehicleDetail().getStartCompanyId()) && !companyIds.contains(orderPageVo.getOrderRentVehicleDetail().getEndCompanyId())) {
 				return ObjectRestResponse.createFailedResult(ResCode.YOU_AUTH_FAIL.getCode(), ResCode.YOU_AUTH_FAIL.getDesc());
 			}
-			if(userDTO.getCompanyId() == orderPageVo.getOrderRentVehicleDetail().getEndCompanyId()) {
+			if (userDTO.getCompanyId() == orderPageVo.getOrderRentVehicleDetail().getEndCompanyId()) {
 				orderPageVo.setUserCompanyStatus(true);
 			}
 			if (orderPageVo.getStatus() == 4) { //未交车
@@ -301,7 +302,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 		Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
 		BigDecimal illegalReserve = new BigDecimal(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.ILLEGAL_RESERVE).getDetail());
 		orderPageVo.setIllegalReserve(illegalReserve);
-		orderPageVo.setItems(orderItemBiz.selectList(new OrderItem(){{
+		orderPageVo.setItems(orderItemBiz.selectList(new OrderItem() {{
 			setOrderId(orderPageVo.getId());
 			setType(104);
 		}}));
@@ -536,8 +537,8 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 			}
 			//设置违约明细
 			for (OrderVehicleCrosstownDto a : orderVehicleCrosstown) {
-                if(a.getType() != CrosstownTypeEnum.DEPARTURE.getCode()) {
-                    if(StringUtils.isNotBlank(a.getViolateDetail())) {
+				if (a.getType() != CrosstownTypeEnum.DEPARTURE.getCode()) {
+					if (StringUtils.isNotBlank(a.getViolateDetail())) {
 						orderPageVo.setDedDetailDTO(a.getViolateDetail());
 					}
 				}
@@ -548,6 +549,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 
 	/**
 	 * 获取驾驶人信息
+	 *
 	 * @param orderPageVo
 	 */
 	public void getDriverInfo(OrderPageVO orderPageVo) {
@@ -595,11 +597,11 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 
 		StringBuilder stringBuilder = new StringBuilder();
 		OrderRentVehicleDetail oldValue = orderRentVehicleBiz.selectById(orderRentVehicleDetail.getId());
-        if(oldValue == null) {
+		if (oldValue == null) {
 			return ObjectRestResponse.createFailedResult(ResCode.ORDER_IS_NOT_EXIST.getCode(), ResCode.ORDER_IS_NOT_EXIST.getDesc());
 		}
 		stringBuilder.append("修改订单和预定记录还车公司成功, 订单ID:");
-        stringBuilder.append( oldValue.getOrderId());
+		stringBuilder.append(oldValue.getOrderId());
 		stringBuilder.append("; 原还车公司ID: ");
 		stringBuilder.append(oldValue.getEndCompanyId());
 		stringBuilder.append("; 更新后还车公司ID: ");
@@ -619,14 +621,14 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 		bookRecordUpdateLog.setCreateTime(new Date());
 		BeanUtil.copyProperties(orderRentVehicleDetail, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
 		CompanyDetail companyDetail = vehicleFeign.getCompanyDetail(orderRentVehicleDetail.getEndCompanyId()).getData();
-        if(companyDetail != null) {
+		if (companyDetail != null) {
 			oldValue.setEndCity(companyDetail.getAddrCity());
 			oldValue.setEndAddr(companyDetail.detailAddr());
 		}
 		oldValue.setEndCompanyId(orderRentVehicleDetail.getEndCompanyId());
 		orderRentVehicleBiz.updateSelectiveByIdRe(oldValue);
 		ObjectRestResponse objectRestResponse = vehicleFeign.update(bookRecordUpdateLog);
-        if (objectRestResponse!= null && objectRestResponse.getRel()) {
+		if (objectRestResponse != null && objectRestResponse.getRel()) {
 			log.info(stringBuilder.toString());
 			return ObjectRestResponse.succ();
 		}
@@ -636,6 +638,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 
 	/**
 	 * 获取订单详情，包含驾驶人信息，违约金等信息
+	 *
 	 * @param no
 	 * @return
 	 */
@@ -660,7 +663,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 				orderPageVo.setVehicalNumberPlat(restResponse.getData().getNumberPlate());
 			}
 		} else if (orderPageVo.getOrderTourDetail() != null) {
-            if(StringUtils.isNotBlank(orderPageVo.getOrderTourDetail().getTourUserIds())) {
+			if (StringUtils.isNotBlank(orderPageVo.getOrderTourDetail().getTourUserIds())) {
 				List<TourUser> list = tourFeign.getTourUsers(orderPageVo.getOrderTourDetail().getTourUserIds()).getData();
 				orderPageVo.getOrderTourDetail().setUserVoList(list == null || list.size() <= 0 ? new ArrayList<>() : list);
 			}
@@ -669,7 +672,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 		Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
 		BigDecimal illegalReserve = new BigDecimal(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.ILLEGAL_RESERVE).getDetail());
 		orderPageVo.setIllegalReserve(illegalReserve);
-        orderPageVo.setItems(orderItemBiz.selectList(new OrderItem(){{
+		orderPageVo.setItems(orderItemBiz.selectList(new OrderItem() {{
 			setOrderId(orderPageVo.getId());
 		}}));
 		return ObjectRestResponse.succ(orderPageVo);
@@ -756,7 +759,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 			}
 
 			try {
-                this.updateSelectiveByIdRe(updateOrder);
+				BeanUtil.copyProperties(this.updateSelectiveByIdReT(updateOrder), baseOrder);
 				//记录订单账款记录
 				Integer flag = orderAccountBiz.addOrderAccount(baseOrder.getId(), "订单支付", oad.getOriginOrderAmount().add(oad.getOriginDepositAmount()), oad.getOrderAmount().add(oad.getDepositAmount()), tradeNo, AccountTypeEnum.IN_ORDER_PAY.getCode(), JSONUtil.toJsonStr(oad));
 			} finally {
@@ -769,8 +772,11 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 				//处理后台用户提醒短信的发送
 //                orderMsgBiz.handelBgUserMsg4Pay(orvd, baseOrder, appUserDTO, OrderMsgBiz.RENT_PAY);
 				sendOrderMq(orvd, otd, omd, baseOrder, OrderMQDTO.ORDER_PAY);
-                if(OrderTypeEnum.MEMBER.getCode().equals(baseOrder.getType())) {
+				if (OrderTypeEnum.MEMBER.getCode().equals(baseOrder.getType())) {
 					sendOrderMq(orvd, otd, omd, baseOrder, OrderMQDTO.ORDER_FINISH);
+					//订单完成时，payway为 支付宝，则转支付
+					baseOrder.setPayWay(payWay);
+					orderAccountBiz.finishFreeze2PayAmount(baseOrder);
 				}
 			}
 		} else {
@@ -827,7 +833,6 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 	}
 
 
-
 //    /**
 //     * 更新（不成功抛异常）
 //     * @param baseOrder

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java

@@ -47,6 +47,7 @@ import java.util.*;
 
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
+import static com.xxfc.platform.order.pojo.pay.NotifyUrlDTO.PAY_WAY_ALI;
 import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
 /**
@@ -742,4 +743,26 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
         }
         return  mapper.outStatisticalData(queryCriteria,startTime,endTime);
     }
+
+    //订单完成时，payway为 支付宝，则转支付
+    public void finishFreeze2PayAmount(BaseOrder baseOrder) {
+        try {
+            if (baseOrder.getPayWay().equals(PAY_WAY_ALI)) {
+                OrderRefundVo orv = new OrderRefundVo();
+                orv.setAmount(baseOrder.getRealAmount().multiply(new BigDecimal("100")).intValue());
+                orv.setOrderNo(baseOrder.getNo());
+                orv.setRefundAmount(0);
+                orv.setRefundDesc("非退款");
+                orv.setFreeze2PayAmount(baseOrder.getRealAmount().multiply(new BigDecimal("100")).intValue());
+                orv.setFreeze2PayDesc(StrUtil.format("冻结转支付{}", baseOrder.getRealAmount()));
+                ObjectRestResponse<String> result = thirdFeign.refund(orv);
+                String refundTradeNo = result.getData();
+                if(null == refundTradeNo) {
+                    log.error("退款没有refundTradeNo，订单号为：{}, 微服务调用结果为{}", baseOrder.getNo(), JSONUtil.toJsonStr(result));
+                }
+            }
+        }catch (Exception ex) {
+            log.error(StrUtil.format("退款异常{}，订单号为：{}", ex.getMessage(), baseOrder.getNo()), ex);
+        }
+    }
 }
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderTourVerificationBiz.java

 package com.xxfc.platform.order.biz;
 
+import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
@@ -11,17 +12,21 @@ import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import com.xxfc.platform.order.pojo.order.OrderTourVerificationVO;
 import com.xxfc.platform.tour.feign.TourFeign;
 import com.xxfc.platform.tour.vo.TourGoodOrderFindVo;
+import com.xxfc.platform.universal.vo.OrderRefundVo;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.time.Instant;
 import java.time.LocalTime;
 import java.time.temporal.ChronoUnit;
 import java.util.Date;
 import java.util.List;
 
+import static com.xxfc.platform.order.pojo.pay.NotifyUrlDTO.PAY_WAY_ALI;
+
 /**
  * 旅游订单核销
  *
@@ -39,6 +44,9 @@ public class OrderTourVerificationBiz{
     private BaseOrderBiz baseOrderBiz;
     @Autowired
     private OrderTourDetailBiz tourDetailBiz;
+    @Autowired
+    private OrderAccountBiz orderAccountBiz;
+
     @Autowired
     private TourFeign tourFeign;
 
@@ -130,6 +138,8 @@ public class OrderTourVerificationBiz{
         tourDetail = tourDetailBiz.updateSelectiveByIdReT(tourDetail);
         tourFeign.updateTourGoodPersonNum(verificationId,"verification_person",total_number);
         baseOrderBiz.sendOrderMq(null,tourDetail,null, baseOrder, OrderMQDTO.ORDER_FINISH);
+        //订单完成时，payway为 支付宝，则转支付
+        orderAccountBiz.finishFreeze2PayAmount(baseOrder);
         return  ObjectRestResponse.succ(tourDetail.getVerificationId());
     }
 

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/weixin/api/WXSuppToUserPay.java

@@ -6,18 +6,7 @@ import com.github.wxiaoqi.security.common.util.OrderUtil;
 import com.github.wxiaoqi.security.common.util.process.SystemConfig;
 import com.xxfc.platform.universal.weixin.util.XMLUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.security.KeyStore;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.TreeMap;
-import javax.net.ssl.SSLContext;
 import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.protocol.HttpClientContext;
@@ -25,11 +14,18 @@ import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
 import org.apache.http.conn.ssl.SSLContexts;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.util.EntityUtils;
 import org.jdom.JDOMException;
+import org.springframework.core.io.ClassPathResource;
+
+import javax.net.ssl.SSLContext;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.KeyStore;
+import java.util.Map;
+import java.util.TreeMap;
 
 
 /**
@@ -54,66 +50,12 @@ public class WXSuppToUserPay {
     private String desc;//企业付款描述信息
     private String spbill_create_ip;//Ip地址
     private String key;
-	public static void main(String[] args) throws Exception, IOException { 
-
-	 	Map<String, String> map = WXSuppToUserPay.WeiXinTiXian("oRhMfwKwjNq2Ce-TxlqfoAqsYfww",OrderUtil.GetOrderNumber("TX"),"NO_CHECK", 500+"", "活动提现", "192.168.8.109");
-		if("SUCCESS".equals(map.get("return_code")))
-		{
-			if(!StringUtils.isBlank(map.get("payment_no")) && !StringUtils.isBlank(map.get("partner_trade_no")) )
-			{
-				System.out.println(map.get("partner_trade_no"));
-				System.out.println(map.get("payment_no"));
-				System.out.println(Integer.parseInt(System.currentTimeMillis()/1000+""));
-	 
-			 
-			} 
-			System.out.println(map.get("return_code"));
-		} 
-//		WXSuppToUserPay prePay = new WXSuppToUserPay();
-	/*	prePay.setMch_appid(SystemConfig.WINXIN_AppID);
-		prePay.setMchid(SystemConfig.WINXIN_PARTNER);*/
-//		prePay.setMch_appid(SystemConfig.APP_ID);
-//		prePay.setMchid(SystemConfig.APP_PARTNER);
-//		prePay.setNonce_str( OrderUtil.CreateNoncestr());
-//		prePay.setPartner_trade_no(OrderUtil.GetOrderNumber("TX"));
-//		prePay.setOpenid("oRhMfwBQ-Ouqhff4AeFOqovgJOAs");
-//		prePay.setCheck_name("NO_CHECK");
-//		prePay.setAmount("100");
-//		prePay.setDesc("活动提现");
-//		prePay.setSpbill_create_ip("192.168.8.109");
-//		//prePay.setKey(SystemConfig.WINXIN_PARTNER_KEY);
-//		String result =postXML(suppTouser,prePay.getXMLTuiKuan());
-		
-//		String result = "<xml>"+
-//		"<return_code><![CDATA[SUCCESS]]></return_code>"+
-//		"<return_msg><![CDATA[]]></return_msg>"+
-//		"<mch_appid><![CDATA[wxa9805823769294b6]]></mch_appid>"+
-//		"<mchid><![CDATA[1327473801]]></mchid>"+
-//		"<device_info><![CDATA[]]></device_info>"+
-//		"<nonce_str><![CDATA[FD45EBC1E1D76BC1FE0BA933E60E9957]]></nonce_str>"+
-//		"<result_code><![CDATA[SUCCESS]]></result_code>"+
-//		"<partner_trade_no><![CDATA[TX20160504120550000001]]></partner_trade_no>"+
-//		"<payment_no><![CDATA[1000018301201605040163328553]]></payment_no>"+
-//		"<payment_time><![CDATA[2016-05-04 12:05:51]]></payment_time>"+
-//		"</xml>";
-//		
-//		
-//		result = result.replaceAll("<![CDATA[|]]>", "");
-//		
-//		Map<String, String> map = XMLUtil.doXMLParse(result);
-//		
-//		System.out.println(map.get("return_code"));
-//		System.out.println(map.get("mchid"));
-//		System.out.println(map.get("payment_no"));
-//		System.out.println(map.get("partner_trade_no"));
-//		System.out.println(map.get("payment_time"));
-	}
 	
 	public static Map<String,String> WeiXinTiXian(String openid,String partnerTradeNo,String check_name,String amount,String desc,String spbill_create_ip)
 	{
 		WXSuppToUserPay prePay = new WXSuppToUserPay();
-			prePay.setMch_appid(SystemConfig.WINXIN_AppID);
-			prePay.setMchid(SystemConfig.WINXIN_PARTNER);
+			prePay.setMch_appid(SystemConfig.APP_ID);
+			prePay.setMchid(SystemConfig.APP_PARTNER);
 			prePay.setNonce_str( OrderUtil.CreateNoncestr());
 			prePay.setPartner_trade_no(partnerTradeNo);
 			prePay.setOpenid(openid);
@@ -138,18 +80,19 @@ public class WXSuppToUserPay {
 		try {
 			KeyStore keyStore = KeyStore.getInstance("PKCS12");
 //			FileInputStream instream = new FileInputStream(new File("E:/cert/apiclient_cert.p12"));
-			String path = Thread.currentThread().getContextClassLoader().getResource("/").getPath();
-			FileInputStream instream = new FileInputStream(new File(path+"/apiclient_cert.p12"));
+			ClassPathResource classPathResource = new ClassPathResource("apiclient_cert.p12");
+			InputStream instream = classPathResource.getInputStream();
 			try {
-				keyStore.load(instream, SystemConfig.WINXIN_PARTNER.toCharArray());
+				keyStore.load(instream, SystemConfig.APP_PARTNER.toCharArray());
 			} finally {
-				if (instream != null)
+				if (instream != null) {
 					instream.close();
 				}
+			}
 			SSLContext sslcontext = SSLContexts.custom().loadKeyMaterial(keyStore, SystemConfig.APP_PARTNER.toCharArray()).build();
 			@SuppressWarnings("deprecation")
 			SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslcontext, new String[] { "TLSv1" },
-					null, SSLConnectionSocketFactory.BROWSER_COMPATIBLE_HOSTNAME_VERIFIER);
+					null, SSLConnectionSocketFactory.getDefaultHostnameVerifier());
 			httpclient = HttpClients.custom().setSSLSocketFactory(sslsf).build();
 			return post(httpclient, uri, xml, "text/xml; charset=UTF-8", "UTF-8", null, null);
 		} catch (Exception e) {

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java

@@ -401,7 +401,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
     }
 
     public String wxpayfundTrans(FundPayVo fundPayVo) {
-        Map<String, String> map = WXSuppToUserPay.WeiXinTiXian(fundPayVo.getAmount(),fundPayVo.getOutBizNo(),fundPayVo.getCheckName(), fundPayVo.getAmount(), fundPayVo.getRemark(), fundPayVo.getCreatIp());
+        Map<String, String> map = WXSuppToUserPay.WeiXinTiXian(fundPayVo.getPayeeAccount(),fundPayVo.getOutBizNo(),fundPayVo.getCheckName(), fundPayVo.getAmount(), fundPayVo.getRemark(), fundPayVo.getCreatIp());
         if (SUCCESS.equals(map.get(WxResponseProperties.RETURN_CODE)) && SUCCESS.equals(map.get(WxResponseProperties.RESULT_CODE))) {
             return map.get(WxResponseProperties.PARTNER_TRADE_NO);
         }

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/handler/WithDrawMqHandler.java

@@ -78,13 +78,13 @@ public class WithDrawMqHandler implements InitializingBean {
             String cono = orderPayBiz.fundTrans(fundPayVo);
             orderNo = fundPayVo.getOrderNo();
             log.info("提现成功：【商户订单号：{}】-->【{}】", cono,msg);
-            userFeign.withDrawprocess(fundPayVo.getOrderNo(), cono, "", true);
+            userFeign.withDrawprocess(fundPayVo.getOrderNo(), cono, "", true,"");
             Long deliveryTag = (Long) headers.get(AmqpHeaders.DELIVERY_TAG);
             // 手动签收
             basicAck(channel, deliveryTag, false, pay_way);
         } catch (UnsupportedEncodingException e) {
             basicNack(channel, message.getMessageProperties().getDeliveryTag(), false, false, pay_way);
-            userFeign.withDrawprocess(fundPayVo.getOrderNo(), "",DEFAULT_ERROR_MSG, false);
+            userFeign.withDrawprocess(fundPayVo.getOrderNo(), "",DEFAULT_ERROR_MSG, false,e.getMessage());
             String reason = String.format("%s%s%s", pay_way, "转账失败", "[不支持的编码:UTF-8]");
             log.info("{}:【{}】", reason, e);
         } catch (BaseException e) {
@@ -95,7 +95,7 @@ public class WithDrawMqHandler implements InitializingBean {
                 Long count = valueOperations.increment(orderNo);
                 if (count <= MAX_RETRY) {
                     //重新把消息放回队列
-                   // basicNack(channel, message.getMessageProperties().getDeliveryTag(), false, true, pay_way);
+                    basicNack(channel, message.getMessageProperties().getDeliveryTag(), false, true, pay_way);
                     try {
                         channel.basicRecover();
                     }catch (IOException ex){
@@ -112,9 +112,8 @@ public class WithDrawMqHandler implements InitializingBean {
             if (aliPayErrorCodes.contains(subCode) && cathType != null && cathType == PayWay.ALI_PAY.getCode()) {
                 msg = AliPayErrorEnum.valueOf(subCode).getSubReason();
             }
-            msg = StringUtils.isEmpty(msg) ? DEFAULT_ERROR_MSG : msg;
-
-            userFeign.withDrawprocess(fundPayVo.getOrderNo(), "", msg, false);
+            String reason = StringUtils.isEmpty(msg) ? DEFAULT_ERROR_MSG : msg;
+            userFeign.withDrawprocess(fundPayVo.getOrderNo(), "",reason, false,e.getMessage());
             //放弃此消息
             basicNack(channel, message.getMessageProperties().getDeliveryTag(), false, false, pay_way);
         }