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,8 +26,7 @@ public class AppUserPositionTempDTO {
     @ApiModelProperty(value = "姓名")
     private String name;
 
-
-    @ApiModelProperty(value = "身份id")
+   @ApiModelProperty(value = "身份id")
     private Integer positionId;
 
     @ApiModelProperty(value = "员工职位id")
@@ -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/AppUserPositionTempBiz.java

 package com.github.wxiaoqi.security.admin.biz;
 
+import com.github.wxiaoqi.security.admin.dto.AppUserPositionChangeRecordDTO;
 import com.github.wxiaoqi.security.admin.dto.AppUserPositionTempDTO;
 import com.github.wxiaoqi.security.admin.dto.AppUserPositionTempFindDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserJobLevel;
@@ -19,6 +20,7 @@ import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +33,8 @@ import java.time.Instant;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.github.wxiaoqi.security.admin.biz.AppUserPositionChangeRecordBiz.*;
+
 
 /**
  * 用户身份职位表
@@ -62,22 +66,24 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
     @Autowired
     AppUserJobLevelBiz jobLevelBiz;
 
+    @Autowired
+    AppUserPositionChangeRecordBiz appUserPositionChangeRecordBiz;
 
-    public ObjectRestResponse add(AppUserPositionTempDTO appUserPositionTempDTO) {
+    public ObjectRestResponse add(AppUserPositionTempDTO appUserPositionTempDTO, Integer updUserId) {
         if (appUserPositionTempDTO == null || StringUtils.isBlank(appUserPositionTempDTO.getPhone()) || StringUtils.isBlank(appUserPositionTempDTO.getName())
                 || appUserPositionTempDTO.getPositionId() == null || appUserPositionTempDTO.getPositionId() == 0) {
             return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "参数不能为空");
         }
-        Integer companyId=appUserPositionTempDTO.getCompanyId();
-        String companyName=appUserPositionTempDTO.getCompanyName();
-       if (!(companyId!=null&&companyId>0&&StringUtils.isNotBlank(companyName)))
-           return  ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "分公司不存在");
-        BranchCompany branchCompany=vehicleFeign.companyId(companyName);
-        if (branchCompany==null){
-            return  ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "分公司不存在");
+        Integer companyId = appUserPositionTempDTO.getCompanyId();
+        String companyName = appUserPositionTempDTO.getCompanyName();
+        if (!(companyId != null && companyId > 0 && StringUtils.isNotBlank(companyName)))
+            return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "分公司不存在");
+        BranchCompany branchCompany = vehicleFeign.companyId(companyName);
+        if (branchCompany == null) {
+            return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "分公司不存在");
         }
-        companyId=branchCompany.getId();
-        companyName=branchCompany.getName();
+        companyId = branchCompany.getId();
+        companyName = branchCompany.getName();
         String phone = appUserPositionTempDTO.getPhone();
         Integer id = appUserPositionTempDTO.getId() == null ? 0 : appUserPositionTempDTO.getId();
         Example example = new Example(AppUserPositionTemp.class);
@@ -102,9 +108,11 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         } else {
             updateSelectiveById(userPositionTemp);
         }
-        if (userId!=0){
-            detailBiz.updateUserPositionByUserId(userId,appUserPositionTempDTO.getPositionId());
+        if (userId != 0) {
+            detailBiz.updateUserPositionByUserId(userId, appUserPositionTempDTO.getPositionId());
         }
+        //记录表插入
+        appUserPositionChangeRecordBiz.addJoinJobRecord(appUserPositionTempDTO, updUserId);
         return ObjectRestResponse.succ();
     }
 
@@ -129,12 +137,12 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         if (Objects.nonNull(appUserPositionTempFindDTO.getCompanyId())) {
             criteria.andEqualTo("companyId", appUserPositionTempFindDTO.getCompanyId());
         }
-        if(Objects.nonNull(appUserPositionTempFindDTO.getStatus())) {
+        if (Objects.nonNull(appUserPositionTempFindDTO.getStatus())) {
             if (DataStatus.USERED.code == appUserPositionTempFindDTO.getStatus()) {
-                criteria.andNotEqualTo("userId",0);
+                criteria.andNotEqualTo("userId", 0);
             }
             if (DataStatus.NO_USERED.code == appUserPositionTempFindDTO.getStatus()) {
-                criteria.andEqualTo("userId",0);
+                criteria.andEqualTo("userId", 0);
             }
         }
         example.setOrderByClause("upd_time desc");
@@ -156,14 +164,14 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         for (AppUserPositionTemp appUserPositionTemp : data) {
             appUserPositionTempVo = new AppUserPositionTempVo();
             BeanUtils.copyProperties(appUserPositionTemp, appUserPositionTempVo);
-            String postionName = postionMap == null ? "" : postionMap.get(appUserPositionTemp.getPositionId())==null?"":postionMap.get(appUserPositionTemp.getPositionId()).getName();
-            String jobName = jobMap == null ? "" : jobMap.get(appUserPositionTemp.getJobId())==null?"":jobMap.get(appUserPositionTemp.getJobId()).getName();
+            String postionName = postionMap == null ? "" : postionMap.get(appUserPositionTemp.getPositionId()) == null ? "" : postionMap.get(appUserPositionTemp.getPositionId()).getName();
+            String jobName = jobMap == null ? "" : jobMap.get(appUserPositionTemp.getJobId()) == null ? "" : jobMap.get(appUserPositionTemp.getJobId()).getName();
             appUserPositionTempVo.setPositionName(postionName);
             appUserPositionTempVo.setJobName(jobName);
-            appUserPositionTempVo.setStatus(appUserPositionTemp.getUserId() == null ? DataStatus.NO_USERED.code : appUserPositionTemp.getUserId()==0?DataStatus.NO_USERED.code:DataStatus.USERED.code);
+            appUserPositionTempVo.setIdQuit(appUserPositionTemp.getIsQuit());
+            appUserPositionTempVo.setStatus(appUserPositionTemp.getUserId() == null ? DataStatus.NO_USERED.code : appUserPositionTemp.getUserId() == 0 ? DataStatus.NO_USERED.code : DataStatus.USERED.code);
             appUserPositionTempVos.add(appUserPositionTempVo);
         }
-
         dataVO.setData(appUserPositionTempVos);
         dataVO.setPageSize(pageDataVO.getPageSize());
         dataVO.setPageNum(pageDataVO.getPageNum());
@@ -172,8 +180,8 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         return dataVO;
     }
 
-    public Map<String,Object> importUserPostion(List<String[]> userPostionData) {
-        Map<String,Object> result = new HashMap<>(2);
+    public Map<String, Object> importUserPostion(List<String[]> userPostionData) {
+        Map<String, Object> result = new HashMap<>(2);
         List<Map<String, Object>> errorResult = Lists.newArrayList();
         Map<String, Object> errorResultMap;
 
@@ -182,37 +190,37 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         for (int i = 0; i < userPostionData.size(); i++) {
             String[] data = userPostionData.get(i);
             Integer postionId = null;
-            String name="";
-            String phone="";
-            String postionName="";
+            String name = "";
+            String phone = "";
+            String postionName = "";
             try {
-                 name = data[0];
-                 phone = data[1];
-                if (StringUtils.isEmpty(phone)){
+                name = data[0];
+                phone = data[1];
+                if (StringUtils.isEmpty(phone)) {
                     throw new BaseException("手机号为空");
                 }
-                 postionName = data[2];
-                if (StringUtils.isEmpty(postionName)){
+                postionName = data[2];
+                if (StringUtils.isEmpty(postionName)) {
                     throw new BaseException("身份为空");
                 }
-                if (StringUtils.isNotBlank(name)){
-                    name.replaceAll(" ","");
+                if (StringUtils.isNotBlank(name)) {
+                    name.replaceAll(" ", "");
                 }
                 Example example = new Example(AppUserPositionTemp.class);
                 example.createCriteria().andEqualTo("phone", phone).andEqualTo("isDel", 0);
                 List<AppUserPositionTemp> list = selectByExample(example);
-                Integer id=0;
-                Integer userId=0;
-                if (list.size()>0){
-                    AppUserPositionTemp appUserPositionTemp1= list.get(0);
-                    id=appUserPositionTemp1.getId();
-                    userId=appUserPositionTemp1.getUserId();
+                Integer id = 0;
+                Integer userId = 0;
+                if (list.size() > 0) {
+                    AppUserPositionTemp appUserPositionTemp1 = list.get(0);
+                    id = appUserPositionTemp1.getId();
+                    userId = appUserPositionTemp1.getUserId();
                 }
-                if (userId==null||userId==0){
+                if (userId == null || userId == 0) {
                     //根据手机号查询userId
                     AppUserLogin userLogin = loginBiz.checkeUserLogin(phone);
                     if (Objects.nonNull(userLogin)) {
-                        userId=userLogin.getId();
+                        userId = userLogin.getId();
                     }
                 }
                 for (Map.Entry<Integer, String> integerStringEntry : entrySet) {
@@ -221,21 +229,21 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
                         break;
                     }
                 }
-                String companyName=data[3];
-                Integer companyId=0;
-                if (StringUtils.isNotBlank(companyName)){
-                    BranchCompany branchCompany=vehicleFeign.companyId(companyName);
-                    if (branchCompany!=null){
-                        companyId=branchCompany.getId();
-                        companyName=branchCompany.getName();
-                    }else {
-                        companyName=null;
+                String companyName = data[3];
+                Integer companyId = 0;
+                if (StringUtils.isNotBlank(companyName)) {
+                    BranchCompany branchCompany = vehicleFeign.companyId(companyName);
+                    if (branchCompany != null) {
+                        companyId = branchCompany.getId();
+                        companyName = branchCompany.getName();
+                    } else {
+                        companyName = null;
                     }
                 }
-                String jobName=data[4];
-                Integer jobId=2;
-                if (StringUtils.isNotBlank(jobName)&&jobName.contains("销售")){
-                    jobId=1;
+                String jobName = data[4];
+                Integer jobId = 2;
+                if (StringUtils.isNotBlank(jobName) && jobName.contains("销售")) {
+                    jobId = 1;
                 }
                 appUserPositionTemp = new AppUserPositionTemp();
                 appUserPositionTemp.setName(name);
@@ -244,45 +252,45 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
                 appUserPositionTemp.setCompanyId(companyId);
                 appUserPositionTemp.setCompanyName(companyName);
                 appUserPositionTemp.setJobId(jobId);
-                if (userId!=null&&userId>0) {
+                if (userId != null && userId > 0) {
                     //更新用户身份信息
                     detailBiz.updateUserPositionByUserId(userId, postionId);
                     appUserPositionTemp.setUserId(userId);
                 }
-                if (id!=null&&id>0){
+                if (id != null && id > 0) {
                     appUserPositionTemp.setId(id);
                     updateSelectiveById(appUserPositionTemp);
-                }else {
+                } else {
                     insertSelective(appUserPositionTemp);
                 }
 
             } catch (BaseException ex) {
                 errorResultMap = new HashMap<>(1);
                 errorResultMap.put("num", i);
-                errorResultMap.put("msg",ex.getMessage());
+                errorResultMap.put("msg", ex.getMessage());
                 errorResult.add(errorResultMap);
-            }catch (ArrayIndexOutOfBoundsException ex){
+            } catch (ArrayIndexOutOfBoundsException ex) {
                 errorResultMap = new HashMap<>(1);
                 errorResultMap.put("num", i);
-                String msg= "";
-                if(StringUtils.isEmpty(phone)){
-                    msg+="手机号码缺失";
+                String msg = "";
+                if (StringUtils.isEmpty(phone)) {
+                    msg += "手机号码缺失";
                 }
-                if (StringUtils.isEmpty(postionName)){
-                    msg+=",身份信息缺失";
+                if (StringUtils.isEmpty(postionName)) {
+                    msg += ",身份信息缺失";
                 }
-                errorResultMap.put("msg",msg);
+                errorResultMap.put("msg", msg);
                 errorResult.add(errorResultMap);
-            } catch (Exception ex){
+            } catch (Exception ex) {
                 errorResultMap = new HashMap<>(1);
                 errorResultMap.put("num", i);
-                errorResultMap.put("msg","数据"+Arrays.toString(data)+"保存失败");
+                errorResultMap.put("msg", "数据" + Arrays.toString(data) + "保存失败");
                 errorResult.add(errorResultMap);
             }
         }
-         result.put("success",userPostionData.size()-errorResult.size());
-         result.put("error",errorResult.size());
-         result.put("data",errorResult);
+        result.put("success", userPostionData.size() - errorResult.size());
+        result.put("error", errorResult.size());
+        result.put("data", errorResult);
         return result;
     }
 
@@ -301,51 +309,137 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
     }
 
 
-    public  void   setPostionIdByPhone(String phone){
+    public void setPostionIdByPhone(String phone) {
         try {
             Example example = new Example(AppUserPositionTemp.class);
             example.createCriteria().andEqualTo("phone", phone).andEqualTo("isDel", 0);
             List<AppUserPositionTemp> list = selectByExample(example);
-            if (CollectionUtils.isEmpty(list)){
-                log.info("----用户无身份----phone==="+phone);
+            if (CollectionUtils.isEmpty(list)) {
+                log.info("----用户无身份----phone===" + phone);
                 return;
             }
-            AppUserPositionTemp positionTemp=list.get(0);
-            if (positionTemp.getUserId()>0){
-                log.info("----用户已存在身份----phone==="+phone);
+            AppUserPositionTemp positionTemp = list.get(0);
+            if (positionTemp.getUserId() > 0) {
+                log.info("----用户已存在身份----phone===" + phone);
                 return;
             }
             //根据手机号查询userId
             AppUserLogin userLogin = loginBiz.checkeUserLogin(phone);
-            if (userLogin==null) {
-                log.info("----用户不存在----phone==="+phone);
+            if (userLogin == null) {
+                log.info("----用户不存在----phone===" + phone);
                 return;
             }
-            Integer userId=userLogin.getId();
+            Integer userId = userLogin.getId();
             positionTemp.setUserId(userId);
-            int num=updateSelectiveByIdRe(positionTemp);
-            if (num>0){
-                Integer postionId=positionTemp.getPositionId();
-                log.info("----用户---postionId===="+postionId+"----phone==="+phone);
+            int num = updateSelectiveByIdRe(positionTemp);
+            if (num > 0) {
+                Integer postionId = positionTemp.getPositionId();
+                log.info("----用户---postionId====" + postionId + "----phone===" + phone);
                 detailBiz.updateUserPositionByUserId(userId, postionId);
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
     }
 
-    public  AppUserPositionTemp getOne(Integer userId){
+    public AppUserPositionTemp getOne(Integer userId) {
         Example example = new Example(AppUserPositionTemp.class);
         example.createCriteria().andEqualTo("userId", userId).andEqualTo("isDel", 0);
-        List<AppUserPositionTemp> list=selectByExample(example);
-        if (list.size()>0){
-            return  list.get(0);
+        List<AppUserPositionTemp> list = selectByExample(example);
+        if (list.size() > 0) {
+            return list.get(0);
         }
         return null;
     }
 
+    /**
+     *
+     * @return
+     */
+    public ObjectRestResponse updateUserPositon(T obj) {
+            Example example = new Example(AppUserPositionTemp.class);
+            Integer userId = 888;
+        example.createCriteria().andEqualTo("userId", userId);
+        List<AppUserPositionTemp> list = selectByExample(example);
+        System.out.println(list);
+        mapper.deleteByExample(example);
+        return ObjectRestResponse.succ("成功:" + list);
+    }
+
 
     public List<Integer> getUserIdByParentCompany(List<Integer> parentCompanyId) {
-       return mapper.getUserIdByParentCompany(parentCompanyId);
+        return mapper.getUserIdByParentCompany(parentCompanyId);
+    }
+
+
+    /**
+     * 员工信息修改，插入变更记录表
+     * zuoyh
+     *
+     * @param changeStatus
+     * @param appUserPositionTempDTO
+     * @return
+     */
+    public ObjectRestResponse addUserPositionChangeRecord(Integer changeStatus, AppUserPositionTempDTO appUserPositionTempDTO, Integer operatorId) {
+
+        if (changeStatus == null) {
+            return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "操作类型参数不能为空");
+        }
+        if (appUserPositionTempDTO == null || StringUtils.isBlank(appUserPositionTempDTO.getPhone()) || StringUtils.isBlank(appUserPositionTempDTO.getName())
+                || appUserPositionTempDTO.getPositionId() == null || appUserPositionTempDTO.getPositionId() == 0 || appUserPositionTempDTO.getCompanyId() == null) {
+            return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "参数不能为空");
+        }
+        AppUserPositionTemp userPositionTemp = new AppUserPositionTemp();
+        Example example = new Example(AppUserPositionTemp.class);
+        example.createCriteria().andEqualTo("id", appUserPositionTempDTO.getId());
+        BeanUtils.copyProperties(appUserPositionTempDTO, userPositionTemp);
+        AppUserPositionTemp oldData = selectById(appUserPositionTempDTO.getId());
+        Long nowTime = System.currentTimeMillis();
+        //2:人事变动(更换职位、身份)：需要删除记录后再新增一条记录
+        //3：修改所属公司 直接修改即可
+        //4：离职
+        if (changeStatus.equals(POSITION_CHANGE) || changeStatus.equals(JOB_CHANGE)) {
+            mapper.deleteByExample(example);
+            userPositionTemp.setCrtTime(nowTime);
+            userPositionTemp.setUpdTime(nowTime);
+            insertSelective(userPositionTemp);
+            //变更记录表插入
+            appUserPositionChangeRecordBiz.addPositionChangeRecord(userPositionTemp, oldData, operatorId, appUserPositionTempDTO.getRelTime());
+        } else if (changeStatus.equals(COMPANY_CHANGE)) {
+            userPositionTemp.setUpdTime(nowTime);
+            updateSelectiveById(userPositionTemp);
+            //变更记录表插入
+            appUserPositionChangeRecordBiz.addPositionChangeRecord(userPositionTemp, oldData, operatorId, appUserPositionTempDTO.getRelTime());
+        } else {
+            userPositionTemp.setUpdTime(nowTime);
+            updateSelectiveById(userPositionTemp);
+            appUserPositionChangeRecordBiz.addPositionChangeRecord(userPositionTemp, oldData, operatorId, appUserPositionTempDTO.getRelTime());
+        }
+        return ObjectRestResponse.succ();
     }
+
+    /**
+     * 员工复职
+     */
+    public ObjectRestResponse andAddUserPositionChangeRecord(AppUserPositionTempDTO appUserPositionTempDTO, Integer operatorId) {
+        if (appUserPositionTempDTO == null || StringUtils.isBlank(appUserPositionTempDTO.getPhone())) {
+            return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, "参数不能为空");
+        }
+        AppUserPositionTemp userPositionTemp = new AppUserPositionTemp();
+        BeanUtils.copyProperties(appUserPositionTempDTO, userPositionTemp);
+        updateSelectiveById(userPositionTemp);
+        userPositionTemp.setUpdTime(System.currentTimeMillis());
+        appUserPositionChangeRecordBiz.andAddJoinJobRecord(appUserPositionTempDTO, operatorId);
+        return ObjectRestResponse.succ();
+    }
+
+
+    /**
+     * 查询员工信息变更记录表
+     */
+
+    public List<AppUserPositionChangeRecordDTO> findPositionChangeRecord(AppUserPositionTemp userPositionTemp) {
+        return appUserPositionChangeRecordBiz.findPositionChangeRecord(userPositionTemp);
+    }
+
 }

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();
-                    relation.setUserId(parentId);
+            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;
+            //判断用户是否有有效的下线
+            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);
-                }
-                Long bindTime = time - validTime;
-                //判断用户是否有有效的下线
-                if (getCountByParentId(userId, bindTime) == 0L) {
-                    relation = getMyBiz().getRelationByUserId(userId);
-                    if (relation == null) {
-                        relation = new AppUserRelation();
-                        relation.setUserId(userId);
+                }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)){
                         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 {
-                        //判断用户是否有有效的上线
-                        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);
-                        }
+                        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,9 +230,9 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper, AppUserRe
         relationTemp.setIsValid(0);
         relationTemp.setType(1);
         relationTemp.setIsDel(0);
-        relationTemp=relationTempBiz.selectOne(relationTemp);
-        if(relationTemp==null){
-           return;
+        relationTemp = relationTempBiz.selectOne(relationTemp);
+        if (relationTemp == null) {
+            return;
         }
         Integer parentId = relationTemp.getUserId();
         bindRelation(platform_userid, parentId, 2);

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,8 +45,15 @@ public class AppUserPositionController {
     @Autowired
     private AppUserPositionTempBiz appUserPositionTempBiz;
 
+    @Autowired
+    private UserAuthUtil userAuthUtil;
+
+    @Autowired
+    private UserAuthConfig userAuthConfig;
+
+
     @GetMapping("/jobs")
-    public ObjectRestResponse  findAllJobs() {
+    public ObjectRestResponse findAllJobs() {
         return ObjectRestResponse.succ(jobLevelBiz.selectListAll());
     }
 
@@ -57,60 +72,120 @@ 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("修改失败");
+        }
+
+    }
 
-        return appUserPositionTempBiz.add(appUserPositionTempDTO);
+    /**
+     * 查询员工信息变更记录表
+     */
+    @GetMapping("/findPositionChangeRecord")
+    public ObjectRestResponse findPositionChangeRecord(AppUserPositionTemp appUserPositionTemp) {
+        return ObjectRestResponse.succ(appUserPositionTempBiz.findPositionChangeRecord(appUserPositionTemp));
+    }
+
+    /**
+     * 员工复职位
+     */
+    @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){
-       PageDataVO<AppUserPositionTempVo>  dataVO =  appUserPositionTempBiz.findWithPage(appUserPositionTempFindDTO);
-       return ObjectRestResponse.succ(dataVO);
+    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){
-     return appUserPositionTempBiz.getUserIdByParentCompany(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

@@ -162,37 +162,37 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 
    // public List<MemberOrderBo>
 
-    /**
-     * 获取订单详情
-     *
-     * @param no
-     * @return
-     */
-    public ObjectRestResponse<OrderPageVO> getOrderDetail(String no, UserDTO userDTO) {
-        OrderPageVO orderPageVo = mapper.getOrderDetail(no);
-        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) {
-            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) {
-            orderPageVo.setTelephone(appUserVo.getUsername());
-            orderPageVo.setUsername(appUserVo.getRealname());
-        }
-        List<BranchCompany> branchCompanies = vehicleFeign.companyAll(userDTO.getDataAll(), userDTO.getDataCompany(), userDTO.getDataZone());
-        List<Integer> companyIds = branchCompanies.stream().map(BranchCompany::getId).collect(Collectors.toList());
-
-        if (orderPageVo.getOrderRentVehicleDetail() != null) {
-
-            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()) {
-                orderPageVo.setUserCompanyStatus(true);
-            }
-            if (orderPageVo.getStatus() == 4) { //未交车
+	/**
+	 * 获取订单详情
+	 *
+	 * @param no
+	 * @return
+	 */
+	public ObjectRestResponse<OrderPageVO> getOrderDetail(String no, UserDTO userDTO) {
+		OrderPageVO orderPageVo = mapper.getOrderDetail(no);
+		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) {
+			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) {
+			orderPageVo.setTelephone(appUserVo.getUsername());
+			orderPageVo.setUsername(appUserVo.getRealname());
+		}
+		List<BranchCompany> branchCompanies = vehicleFeign.companyAll(userDTO.getDataAll(), userDTO.getDataCompany(), userDTO.getDataZone());
+		List<Integer> companyIds = branchCompanies.stream().map(BranchCompany::getId).collect(Collectors.toList());
+
+		if (orderPageVo.getOrderRentVehicleDetail() != null) {
+
+			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()) {
+				orderPageVo.setUserCompanyStatus(true);
+			}
+			if (orderPageVo.getStatus() == 4) { //未交车
 //                boolean flag = getTodayTime(orderPageVo.getOrderRentVehicleDetail().getStartTime());
 //                if (!flag) {
 //                    return ObjectRestResponse.createFailedResult(3501, "今日不是交车日期");
@@ -236,22 +236,23 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 	}
 
 
-    /**
-     * 后台获取订单详情
-     * @param no
-     * @param userDTO
-     * @return
-     */
+	/**
+	 * 后台获取订单详情
+	 *
+	 * @param no
+	 * @param userDTO
+	 * @return
+	 */
 	public ObjectRestResponse<OrderPageVO> orderDetail(String no, UserDTO userDTO) {
 		OrderPageVO orderPageVo = mapper.getOrderDetail(no);
 		if (orderPageVo == null) {
 			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());
+			orderPageVo.setPositionName(appUserVo.getPositionName());
 		}
 		List<BranchCompany> branchCompanies = vehicleFeign.companyAll(userDTO.getDataAll(), userDTO.getDataCompany(), userDTO.getDataZone());
 		List<Integer> companyIds = branchCompanies.stream().map(BranchCompany::getId).collect(Collectors.toList());
@@ -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);
 		}}));
@@ -309,23 +310,23 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 	}
 
 
-    //获取两个日期之间的天数（不包含头尾）
-    public int getDaysBetweenDateTime(DateTime startDay, DateTime endDay) {
-        int a = 0;
-        for (DateTime curDate = startDay.plusDays(1); curDate.compareTo(endDay) < 0; curDate = curDate.plusDays(1)) {
-            a++;
-        }
-        return a;
-    }
+	//获取两个日期之间的天数（不包含头尾）
+	public int getDaysBetweenDateTime(DateTime startDay, DateTime endDay) {
+		int a = 0;
+		for (DateTime curDate = startDay.plusDays(1); curDate.compareTo(endDay) < 0; curDate = curDate.plusDays(1)) {
+			a++;
+		}
+		return a;
+	}
 
-    //获取两个日期之间的天数（包含头尾）
-    public int getDaysBetweenDateTimeHasStartEnd(DateTime startDay, DateTime endDay) {
-        int a = 0;
-        for (DateTime curDate = startDay; curDate.compareTo(endDay) <= 0; curDate = curDate.plusHours(1)) {
-            a++;
-        }
-        return a;
-    }
+	//获取两个日期之间的天数（包含头尾）
+	public int getDaysBetweenDateTimeHasStartEnd(DateTime startDay, DateTime endDay) {
+		int a = 0;
+		for (DateTime curDate = startDay; curDate.compareTo(endDay) <= 0; curDate = curDate.plusHours(1)) {
+			a++;
+		}
+		return a;
+	}
 
 //    public static void main(String[] args) {
 //        DateTime dateTime = DateTime.parse("2019-09-20 12:00:00", DEFAULT_DATE_TIME_FORMATTER);
@@ -476,13 +477,13 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
             dedDetailDTO.setType(OrderViolateEnum.DELAY_VEHICLE.getCode());
             detailName = "延长还车";
         }
-        //900元+违约金（￥900x2天=）1800元
-        dedDetailDTO.setDeductions(stringBuilder.toString());
-        dedDetailDTO.setCost(cost);
-        dedDetailDTO.setId(1);
-        dedDetailDTO.setStatusIndex(1);
-        dedDetailDTO.setStatusName(detailName);
-    }
+		//900元+违约金（￥900x2天=）1800元
+		dedDetailDTO.setDeductions(stringBuilder.toString());
+		dedDetailDTO.setCost(cost);
+		dedDetailDTO.setId(1);
+		dedDetailDTO.setStatusIndex(1);
+		dedDetailDTO.setStatusName(detailName);
+	}
 
 	/**
 	 * 获取驾驶人驾照
@@ -520,62 +521,63 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 		orderPageVo.setOrderVehicleCrosstownDto(orderVehicleCrosstownDto);
 	}
 
-    //后台获取用户驾驶信息
-    public void getUserLicense1(OrderPageVO orderPageVo) {
-        OrderVehicleCrosstownDto orderVehicleCrosstownDto = new OrderVehicleCrosstownDto();
-        orderVehicleCrosstownDto.setOrderId(orderPageVo.getId());
-        orderVehicleCrosstownDto.setOrderNo(orderPageVo.getNo());
-        List<OrderVehicleCrosstownDto> orderVehicleCrosstown = orderVehicleCrosstownBiz.selectByOrderId(orderVehicleCrosstownDto);
-        if (orderVehicleCrosstown != null && orderVehicleCrosstown.size() > 0) {
-            List<OrderUserLicense> orderUserLicenses = orderUserLicenseBiz.selectByIds(orderVehicleCrosstown.get(0).getUserLicenseId()).getData();
-            if (orderUserLicenses != null && orderUserLicenses.size() > 0) {
-                orderVehicleCrosstownDto.setLicenseIdCard(orderUserLicenses.get(0).getLicenseIdCard());
-                orderVehicleCrosstownDto.setLicenseImg(orderUserLicenses.get(0).getLicenseImg());
-                orderVehicleCrosstownDto.setLicenseName(orderUserLicenses.get(0).getLicenseName());
-                orderVehicleCrosstownDto.setLicensePhone(orderUserLicenses.get(0).getLicensePhone());
-            }
-            //设置违约明细
-            for (OrderVehicleCrosstownDto a : orderVehicleCrosstown) {
-                if(a.getType() != CrosstownTypeEnum.DEPARTURE.getCode()) {
-                    if(StringUtils.isNotBlank(a.getViolateDetail())) {
-                        orderPageVo.setDedDetailDTO(a.getViolateDetail());
-                    }
-                }
-            }
-        }
-        orderPageVo.setOrderVehicleCrosstownDto(orderVehicleCrosstownDto);
-    }
+	//后台获取用户驾驶信息
+	public void getUserLicense1(OrderPageVO orderPageVo) {
+		OrderVehicleCrosstownDto orderVehicleCrosstownDto = new OrderVehicleCrosstownDto();
+		orderVehicleCrosstownDto.setOrderId(orderPageVo.getId());
+		orderVehicleCrosstownDto.setOrderNo(orderPageVo.getNo());
+		List<OrderVehicleCrosstownDto> orderVehicleCrosstown = orderVehicleCrosstownBiz.selectByOrderId(orderVehicleCrosstownDto);
+		if (orderVehicleCrosstown != null && orderVehicleCrosstown.size() > 0) {
+			List<OrderUserLicense> orderUserLicenses = orderUserLicenseBiz.selectByIds(orderVehicleCrosstown.get(0).getUserLicenseId()).getData();
+			if (orderUserLicenses != null && orderUserLicenses.size() > 0) {
+				orderVehicleCrosstownDto.setLicenseIdCard(orderUserLicenses.get(0).getLicenseIdCard());
+				orderVehicleCrosstownDto.setLicenseImg(orderUserLicenses.get(0).getLicenseImg());
+				orderVehicleCrosstownDto.setLicenseName(orderUserLicenses.get(0).getLicenseName());
+				orderVehicleCrosstownDto.setLicensePhone(orderUserLicenses.get(0).getLicensePhone());
+			}
+			//设置违约明细
+			for (OrderVehicleCrosstownDto a : orderVehicleCrosstown) {
+				if (a.getType() != CrosstownTypeEnum.DEPARTURE.getCode()) {
+					if (StringUtils.isNotBlank(a.getViolateDetail())) {
+						orderPageVo.setDedDetailDTO(a.getViolateDetail());
+					}
+				}
+			}
+		}
+		orderPageVo.setOrderVehicleCrosstownDto(orderVehicleCrosstownDto);
+	}
 
-    /**
-     *  获取驾驶人信息
-     * @param orderPageVo
-     */
-    public void  getDriverInfo(OrderPageVO orderPageVo) {
-        List<VehicleUserLicense> vehicleUserLicenses = Lists.newArrayList();
-        String myDriverIds = orderPageVo.getOrderRentVehicleDetail().getMyDriverIds();
-        if (StringUtils.isNotBlank(myDriverIds)) {
-            if (myDriverIds.contains(",")) {
-                String[] ids = myDriverIds.split(",");
-                try {
-                    //目前暂定一个驾驶人，后期需要更改再此更改
-                    RestResponse<VehicleUserLicense> restResponse = vehicleFeign.getOne(Integer.parseInt(ids[0]));
-                    log.info(restResponse.getMessage());
-                    if (restResponse.getData() != null) {
-                        vehicleUserLicenses.add(restResponse.getData());
-                    }
-                } catch (Exception e) {
-                    log.error(e.getMessage(), e);
-                }
-            } else {
-                try {
-                    vehicleUserLicenses.add(vehicleFeign.getOne(Integer.parseInt(myDriverIds.trim())).getData());
-                } catch (Exception e) {
-                    log.error(e.getMessage(), e);
-                }
-            }
-        }
-        orderPageVo.setVehicleUserLicenses(vehicleUserLicenses);
-    }
+	/**
+	 * 获取驾驶人信息
+	 *
+	 * @param orderPageVo
+	 */
+	public void getDriverInfo(OrderPageVO orderPageVo) {
+		List<VehicleUserLicense> vehicleUserLicenses = Lists.newArrayList();
+		String myDriverIds = orderPageVo.getOrderRentVehicleDetail().getMyDriverIds();
+		if (StringUtils.isNotBlank(myDriverIds)) {
+			if (myDriverIds.contains(",")) {
+				String[] ids = myDriverIds.split(",");
+				try {
+					//目前暂定一个驾驶人，后期需要更改再此更改
+					RestResponse<VehicleUserLicense> restResponse = vehicleFeign.getOne(Integer.parseInt(ids[0]));
+					log.info(restResponse.getMessage());
+					if (restResponse.getData() != null) {
+						vehicleUserLicenses.add(restResponse.getData());
+					}
+				} catch (Exception e) {
+					log.error(e.getMessage(), e);
+				}
+			} else {
+				try {
+					vehicleUserLicenses.add(vehicleFeign.getOne(Integer.parseInt(myDriverIds.trim())).getData());
+				} catch (Exception e) {
+					log.error(e.getMessage(), e);
+				}
+			}
+		}
+		orderPageVo.setVehicleUserLicenses(vehicleUserLicenses);
+	}
 
 	/**
 	 * 修改订单还车公司
@@ -593,239 +595,242 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 			return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, ResultCode.getMsg(ResultCode.RSTOKEN_EXPIRED_CODE));
 		}
 
-        StringBuilder stringBuilder = new StringBuilder();
-        OrderRentVehicleDetail oldValue = orderRentVehicleBiz.selectById(orderRentVehicleDetail.getId());
-        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("; 原还车公司ID: ");
-        stringBuilder.append(oldValue.getEndCompanyId());
-        stringBuilder.append("; 更新后还车公司ID: ");
-        stringBuilder.append(orderRentVehicleDetail.getEndCompanyId());
-        stringBuilder.append("; 操作人ID：");
-        stringBuilder.append(userDTO.getId());
-        stringBuilder.append("; 操作人账号：");
-        stringBuilder.append(userDTO.getUsername());
-        //添加修改记录实体
-        BookRecordUpdateLog bookRecordUpdateLog = new BookRecordUpdateLog();
-        bookRecordUpdateLog.setBookRecordId(oldValue.getBookRecordId());
-        bookRecordUpdateLog.setOldRetCompanyId(oldValue.getEndCompanyId());
-        bookRecordUpdateLog.setNewRetCompanyId(orderRentVehicleDetail.getEndCompanyId());
-        bookRecordUpdateLog.setOperaterId(userDTO.getId());
-        bookRecordUpdateLog.setOperaterName(userDTO.getName());
-        bookRecordUpdateLog.setOrderId(oldValue.getOrderId());
-        bookRecordUpdateLog.setCreateTime(new Date());
-        BeanUtil.copyProperties(orderRentVehicleDetail, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
-        CompanyDetail companyDetail = vehicleFeign.getCompanyDetail(orderRentVehicleDetail.getEndCompanyId()).getData();
-        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()) {
-            log.info(stringBuilder.toString());
-            return ObjectRestResponse.succ();
-        }
-        return ObjectRestResponse.createFailedResult(1355, "修改失败！");
-    }
+		StringBuilder stringBuilder = new StringBuilder();
+		OrderRentVehicleDetail oldValue = orderRentVehicleBiz.selectById(orderRentVehicleDetail.getId());
+		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("; 原还车公司ID: ");
+		stringBuilder.append(oldValue.getEndCompanyId());
+		stringBuilder.append("; 更新后还车公司ID: ");
+		stringBuilder.append(orderRentVehicleDetail.getEndCompanyId());
+		stringBuilder.append("; 操作人ID：");
+		stringBuilder.append(userDTO.getId());
+		stringBuilder.append("; 操作人账号：");
+		stringBuilder.append(userDTO.getUsername());
+		//添加修改记录实体
+		BookRecordUpdateLog bookRecordUpdateLog = new BookRecordUpdateLog();
+		bookRecordUpdateLog.setBookRecordId(oldValue.getBookRecordId());
+		bookRecordUpdateLog.setOldRetCompanyId(oldValue.getEndCompanyId());
+		bookRecordUpdateLog.setNewRetCompanyId(orderRentVehicleDetail.getEndCompanyId());
+		bookRecordUpdateLog.setOperaterId(userDTO.getId());
+		bookRecordUpdateLog.setOperaterName(userDTO.getName());
+		bookRecordUpdateLog.setOrderId(oldValue.getOrderId());
+		bookRecordUpdateLog.setCreateTime(new Date());
+		BeanUtil.copyProperties(orderRentVehicleDetail, oldValue, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+		CompanyDetail companyDetail = vehicleFeign.getCompanyDetail(orderRentVehicleDetail.getEndCompanyId()).getData();
+		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()) {
+			log.info(stringBuilder.toString());
+			return ObjectRestResponse.succ();
+		}
+		return ObjectRestResponse.createFailedResult(1355, "修改失败！");
+	}
 
 
-    /**
-     * 获取订单详情，包含驾驶人信息，违约金等信息
-     * @param no
-     * @return
-     */
-    public ObjectRestResponse<OrderPageVO> getOrderDetail(String no) {
-        OrderPageVO orderPageVo = mapper.getOrderDetail(no);
-        if (orderPageVo == null) {
-            return ObjectRestResponse.createFailedResult(ResCode.ORDER_IS_NOT_EXIST.getCode(), ResCode.ORDER_IS_NOT_EXIST.getDesc());
-        }
-        if (orderPageVo.getOrderRentVehicleDetail() != null) {
-            if (orderPageVo.getStatus() == 4) { //未交车
+	/**
+	 * 获取订单详情，包含驾驶人信息，违约金等信息
+	 *
+	 * @param no
+	 * @return
+	 */
+	public ObjectRestResponse<OrderPageVO> getOrderDetail(String no) {
+		OrderPageVO orderPageVo = mapper.getOrderDetail(no);
+		if (orderPageVo == null) {
+			return ObjectRestResponse.createFailedResult(ResCode.ORDER_IS_NOT_EXIST.getCode(), ResCode.ORDER_IS_NOT_EXIST.getDesc());
+		}
+		if (orderPageVo.getOrderRentVehicleDetail() != null) {
+			if (orderPageVo.getStatus() == 4) { //未交车
 //                boolean flag = getTodayTime(orderPageVo.getOrderRentVehicleDetail().getStartTime());
 //                if (!flag) {
 //                    return ObjectRestResponse.createFailedResult(3501, "今日不是交车日期");
 //                }
-                getDriverInfo(orderPageVo);
-            } else if (orderPageVo.getStatus() >= 5 || orderPageVo.getStatus() == -1) {//出行中 已交车
-                getDriverInfo(orderPageVo);
-                getUserLicense(orderPageVo);
-            }
-            RestResponse<Vehicle> restResponse = vehicleFeign.findById(orderPageVo.getOrderRentVehicleDetail().getVehicleId());
-            if (restResponse.getData() != null) {
-                orderPageVo.setVehicalNumberPlat(restResponse.getData().getNumberPlate());
-            }
-        } else if (orderPageVo.getOrderTourDetail() != null) {
-            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);
-            }
-        }
-        //设置保留金
-        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(){{
-            setOrderId(orderPageVo.getId());
-        }}));
-        return ObjectRestResponse.succ(orderPageVo);
-    }
+				getDriverInfo(orderPageVo);
+			} else if (orderPageVo.getStatus() >= 5 || orderPageVo.getStatus() == -1) {//出行中 已交车
+				getDriverInfo(orderPageVo);
+				getUserLicense(orderPageVo);
+			}
+			RestResponse<Vehicle> restResponse = vehicleFeign.findById(orderPageVo.getOrderRentVehicleDetail().getVehicleId());
+			if (restResponse.getData() != null) {
+				orderPageVo.setVehicalNumberPlat(restResponse.getData().getNumberPlate());
+			}
+		} else if (orderPageVo.getOrderTourDetail() != null) {
+			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);
+			}
+		}
+		//设置保留金
+		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() {{
+			setOrderId(orderPageVo.getId());
+		}}));
+		return ObjectRestResponse.succ(orderPageVo);
+	}
+
+	/**
+	 * 支付回调处理
+	 *
+	 * @param orderNo
+	 * @param tradeNo
+	 */
+	@Transactional
+	public void payNotifyHandle(String orderNo, String tradeNo, Integer type, Integer payWay) {
+		OrderRentVehicleDetail orvd = new OrderRentVehicleDetail();
+		OrderTourDetail otd = new OrderTourDetail();
+		OrderMemberDetail omd = new OrderMemberDetail();
+		BaseOrder baseOrder = this.selectOne(new BaseOrder() {{
+			setNo(orderNo);
+		}});
+
+		if (OrderStatusEnum.ORDER_UNPAY.getCode().equals(baseOrder.getStatus()) && baseOrder.getHasPay().equals(SYS_FALSE)) {
+			BaseOrder updateOrder = new BaseOrder() {{
+				setId(baseOrder.getId());
+				setOutTradeNo(tradeNo);
+				setHasPay(SYS_TRUE);
+				setPayTime(System.currentTimeMillis());
+				setPayOrigin(type);
+				setPayWay(payWay);
+				setVersion(baseOrder.getVersion());
+			}};
+
+			//订单账款类
+			OrderAccountDetail oad = new OrderAccountDetail();
+			oad.setOriginOrderAmount(baseOrder.getGoodsAmount().subtract(baseOrder.getCouponAmount()));
+			//账单的的orderAmount 对应 的是商品金额
+			oad.setOrderAmount(baseOrder.getGoodsAmount().subtract(baseOrder.getCouponAmount()));
+
+			//如果是会员订单，则触发会员效益
+			if (OrderTypeEnum.MEMBER.getCode().equals(baseOrder.getType())) {
+				//直接设置订单完成
+				updateOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
+				omd = orderMemberDetailBiz.selectOne(new OrderMemberDetail() {{
+					setOrderId(baseOrder.getId());
+				}});
+
+				//触发会员效益
+				UserMemberDTO userMemberDTO = new UserMemberDTO() {{
+					setUserId(baseOrder.getUserId());
+					setIsBind(ISBIND_BIND);
+				}};
+				userMemberDTO.setMemberLevel(omd.getMemberLevel());
+				userMemberDTO.setRentFreeDays(omd.getRentFreeNum());
+				userMemberDTO.setTotalNumber(omd.getRentFreeNum());
+				userMemberDTO.setDiscount(omd.getRebate());
+
+				ObjectRestResponse orr = userFeign.buyMember(userMemberDTO);
+				log.info("orr.getStatus() : " + orr.getStatus());
+			} else if (OrderTypeEnum.RENT_VEHICLE.getCode().equals(baseOrder.getType())) {
+				updateOrder.setStatus(OrderStatusEnum.ORDER_TOSTART.getCode());
+				orvd = orderRentVehicleBiz.selectOne(new OrderRentVehicleDetail() {{
+					setOrderId(baseOrder.getId());
+				}});
+
+				//账款设置押金
+				oad.setOriginDepositAmount(orvd.getDeposit());
+				oad.setDepositAmount(orvd.getDeposit());
+
+				//车辆预定审核通过
+				RestResponse<Integer> result = vehicleFeign.rentProveVehicleBooking(orvd.getBookRecordId());
+
+				//确认免费天数
+				if (orvd.getFreeDays() > 0) {
+					userFeign.memberDays(baseOrder.getUserId(), orvd.getFreeDays(), UserFeign.MEMBER_DAYS_CONFIRM);
+				}
+
+			} else if (OrderTypeEnum.TOUR.getCode().equals(baseOrder.getType())) {
+				updateOrder.setStatus(OrderStatusEnum.ORDER_TOSTART.getCode());
+				otd = orderTourDetailBiz.selectOne(new OrderTourDetail() {{
+					setOrderId(baseOrder.getId());
+				}});
+
+				//站点总人数添加
+				tourFeign.updateTourGoodPersonNum(otd.getVerificationId(), TourFeign.TOTAL_PERSON, otd.getTotalNumber());
+			}
 
-    /**
-     * 支付回调处理
-     *
-     * @param orderNo
-     * @param tradeNo
-     */
-    @Transactional
-    public void payNotifyHandle(String orderNo, String tradeNo, Integer type, Integer payWay) {
-        OrderRentVehicleDetail orvd = new OrderRentVehicleDetail();
-        OrderTourDetail otd = new OrderTourDetail();
-        OrderMemberDetail omd = new OrderMemberDetail();
-        BaseOrder baseOrder = this.selectOne(new BaseOrder() {{
-            setNo(orderNo);
-        }});
-
-        if (OrderStatusEnum.ORDER_UNPAY.getCode().equals(baseOrder.getStatus()) && baseOrder.getHasPay().equals(SYS_FALSE)) {
-            BaseOrder updateOrder = new BaseOrder() {{
-                setId(baseOrder.getId());
-                setOutTradeNo(tradeNo);
-                setHasPay(SYS_TRUE);
-                setPayTime(System.currentTimeMillis());
-                setPayOrigin(type);
-                setPayWay(payWay);
-                setVersion(baseOrder.getVersion());
-            }};
-
-            //订单账款类
-            OrderAccountDetail oad = new OrderAccountDetail();
-            oad.setOriginOrderAmount(baseOrder.getGoodsAmount().subtract(baseOrder.getCouponAmount()));
-            //账单的的orderAmount 对应 的是商品金额
-            oad.setOrderAmount(baseOrder.getGoodsAmount().subtract(baseOrder.getCouponAmount()));
-
-            //如果是会员订单，则触发会员效益
-            if (OrderTypeEnum.MEMBER.getCode().equals(baseOrder.getType())) {
-                //直接设置订单完成
-                updateOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
-                omd = orderMemberDetailBiz.selectOne(new OrderMemberDetail() {{
-                    setOrderId(baseOrder.getId());
-                }});
-
-                //触发会员效益
-                UserMemberDTO userMemberDTO = new UserMemberDTO() {{
-                    setUserId(baseOrder.getUserId());
-                    setIsBind(ISBIND_BIND);
-                }};
-                userMemberDTO.setMemberLevel(omd.getMemberLevel());
-                userMemberDTO.setRentFreeDays(omd.getRentFreeNum());
-                userMemberDTO.setTotalNumber(omd.getRentFreeNum());
-                userMemberDTO.setDiscount(omd.getRebate());
-
-                ObjectRestResponse orr = userFeign.buyMember(userMemberDTO);
-                log.info("orr.getStatus() : " + orr.getStatus());
-            } else if (OrderTypeEnum.RENT_VEHICLE.getCode().equals(baseOrder.getType())) {
-                updateOrder.setStatus(OrderStatusEnum.ORDER_TOSTART.getCode());
-                orvd = orderRentVehicleBiz.selectOne(new OrderRentVehicleDetail() {{
-                    setOrderId(baseOrder.getId());
-                }});
-
-                //账款设置押金
-                oad.setOriginDepositAmount(orvd.getDeposit());
-                oad.setDepositAmount(orvd.getDeposit());
-
-                //车辆预定审核通过
-                RestResponse<Integer> result = vehicleFeign.rentProveVehicleBooking(orvd.getBookRecordId());
-
-                //确认免费天数
-                if (orvd.getFreeDays() > 0) {
-                    userFeign.memberDays(baseOrder.getUserId(), orvd.getFreeDays(), UserFeign.MEMBER_DAYS_CONFIRM);
-                }
-
-            } else if (OrderTypeEnum.TOUR.getCode().equals(baseOrder.getType())) {
-                updateOrder.setStatus(OrderStatusEnum.ORDER_TOSTART.getCode());
-                otd = orderTourDetailBiz.selectOne(new OrderTourDetail() {{
-                    setOrderId(baseOrder.getId());
-                }});
-
-                //站点总人数添加
-                tourFeign.updateTourGoodPersonNum(otd.getVerificationId(), TourFeign.TOTAL_PERSON, otd.getTotalNumber());
-            }
-
-            try {
-                this.updateSelectiveByIdRe(updateOrder);
-                //记录订单账款记录
-                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 {
-                AppUserDTO appUserDTO = userFeign.userDetailById(baseOrder.getUserId()).getData();
-
-                //处理App用户提醒短信的发送
+			try {
+				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 {
+				AppUserDTO appUserDTO = userFeign.userDetailById(baseOrder.getUserId()).getData();
+
+				//处理App用户提醒短信的发送
 //                orderMsgBiz.handelAppUserMsg(orvd, omd, baseOrder, appUserDTO);
-                orderMsgBiz.handelMsgPayNew(orvd, otd, omd, baseOrder, appUserDTO);
+				orderMsgBiz.handelMsgPayNew(orvd, otd, omd, baseOrder, appUserDTO);
 
-                //处理后台用户提醒短信的发送
+				//处理后台用户提醒短信的发送
 //                orderMsgBiz.handelBgUserMsg4Pay(orvd, baseOrder, appUserDTO, OrderMsgBiz.RENT_PAY);
-                sendOrderMq(orvd, otd, omd, baseOrder, OrderMQDTO.ORDER_PAY);
-                if(OrderTypeEnum.MEMBER.getCode().equals(baseOrder.getType())) {
-                    sendOrderMq(orvd, otd, omd, baseOrder, OrderMQDTO.ORDER_FINISH);
-                }
-            }
-        } else {
-            log.error(" order has payed , orderNo:{}, tradeNo:{} ", orderNo, tradeNo);
-        }
-    }
-
-    public void sendOrderMq(OrderRentVehicleDetail orvd, OrderTourDetail otd, OrderMemberDetail omd, BaseOrder baseOrder, Integer sign) {
-        //发送队列消息
-        OrderMQDTO orderMQDTO = BeanUtil.toBean(baseOrder, OrderMQDTO.class);
-        orderMQDTO.setOrderRentVehicleDetail(orvd);
-        orderMQDTO.setOrderTourDetail(otd);
-        orderMQDTO.setOrderMemberDetail(omd);
+				sendOrderMq(orvd, otd, omd, baseOrder, OrderMQDTO.ORDER_PAY);
+				if (OrderTypeEnum.MEMBER.getCode().equals(baseOrder.getType())) {
+					sendOrderMq(orvd, otd, omd, baseOrder, OrderMQDTO.ORDER_FINISH);
+					//订单完成时，payway为 支付宝，则转支付
+					baseOrder.setPayWay(payWay);
+					orderAccountBiz.finishFreeze2PayAmount(baseOrder);
+				}
+			}
+		} else {
+			log.error(" order has payed , orderNo:{}, tradeNo:{} ", orderNo, tradeNo);
+		}
+	}
 
-        //获取item
-        orderMQDTO.setItems(orderItemBiz.selectList(new OrderItem() {{
-            setOrderId(baseOrder.getId());
-        }}));
+	public void sendOrderMq(OrderRentVehicleDetail orvd, OrderTourDetail otd, OrderMemberDetail omd, BaseOrder baseOrder, Integer sign) {
+		//发送队列消息
+		OrderMQDTO orderMQDTO = BeanUtil.toBean(baseOrder, OrderMQDTO.class);
+		orderMQDTO.setOrderRentVehicleDetail(orvd);
+		orderMQDTO.setOrderTourDetail(otd);
+		orderMQDTO.setOrderMemberDetail(omd);
 
-        sendQueue(orderMQDTO, sign);
-    }
+		//获取item
+		orderMQDTO.setItems(orderItemBiz.selectList(new OrderItem() {{
+			setOrderId(baseOrder.getId());
+		}}));
 
-    @Override
-    public void updateSelectiveById(BaseOrder entity) {
-        super.updateSelectiveById(entity);
-    }
+		sendQueue(orderMQDTO, sign);
+	}
 
-    /**
-     * 更新（不成功抛异常）
-     *
-     * @param baseOrder
-     * @return
-     */
-    public BaseOrder updateSelectiveByIdReT(BaseOrder baseOrder) {
-        return updateSelectiveByIdReT(baseOrder, false);
-    }
+	@Override
+	public void updateSelectiveById(BaseOrder entity) {
+		super.updateSelectiveById(entity);
+	}
 
-    /**
-     * 更新（不成功抛异常）
-     *
-     * @param baseOrder
-     * @return
-     */
-    public BaseOrder updateSelectiveByIdReT(BaseOrder baseOrder, boolean needVersion) {
-        if (needVersion) {
-            baseOrder.setVersion(selectById(baseOrder.getId()).getVersion());
-        }
-        if (updateSelectiveByIdRe(baseOrder) > 0) {
-            return selectById(baseOrder.getId());
-        } else {
-            log.error(StrUtil.format("数据更新失败：baseOrder: {}", JSONUtil.toJsonStr(baseOrder)));
-            throw new BaseException(ResultCode.DB_OPERATION_FAIL_CODE);
-        }
-    }
+	/**
+	 * 更新（不成功抛异常）
+	 *
+	 * @param baseOrder
+	 * @return
+	 */
+	public BaseOrder updateSelectiveByIdReT(BaseOrder baseOrder) {
+		return updateSelectiveByIdReT(baseOrder, false);
+	}
 
+	/**
+	 * 更新（不成功抛异常）
+	 *
+	 * @param baseOrder
+	 * @return
+	 */
+	public BaseOrder updateSelectiveByIdReT(BaseOrder baseOrder, boolean needVersion) {
+		if (needVersion) {
+			baseOrder.setVersion(selectById(baseOrder.getId()).getVersion());
+		}
+		if (updateSelectiveByIdRe(baseOrder) > 0) {
+			return selectById(baseOrder.getId());
+		} else {
+			log.error(StrUtil.format("数据更新失败：baseOrder: {}", JSONUtil.toJsonStr(baseOrder)));
+			throw new BaseException(ResultCode.DB_OPERATION_FAIL_CODE);
+		}
+	}
 
 
 //    /**
@@ -841,19 +846,19 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 //        }
 //    }
 
-    public boolean getTodayTime(Long time) {
-        Long startTime = getDayStart();
-        if (time >= startTime && time <= startTime + 24 * 60 * 60 * 1000 - 1) {
-            return true;
-        }
-        return false;
-    }
+	public boolean getTodayTime(Long time) {
+		Long startTime = getDayStart();
+		if (time >= startTime && time <= startTime + 24 * 60 * 60 * 1000 - 1) {
+			return true;
+		}
+		return false;
+	}
 
-    public static Long getDayStart() {
-        long current = System.currentTimeMillis();
-        long zero = current / (1000 * 3600 * 24) * (1000 * 3600 * 24) - TimeZone.getDefault().getRawOffset();
-        return zero;
-    }
+	public static Long getDayStart() {
+		long current = System.currentTimeMillis();
+		long zero = current / (1000 * 3600 * 24) * (1000 * 3600 * 24) - TimeZone.getDefault().getRawOffset();
+		return zero;
+	}
 
 	private void sendQueue(OrderMQDTO orderMQDTO, Integer sign) {
 		try {

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);
         }