用户同步

jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java

@@ -88,12 +88,12 @@ public class CompanyLoginController {
         String realKey = MD5Util.MD5Encode(lowerCaseCaptcha + sysLoginModel.getCheckKey(), "utf-8");
         Object checkCode = redisUtil.get(realKey);
         //当进入登录页时，有一定几率出现验证码错误 #1714
-        if (checkCode == null || !checkCode.toString().equals(lowerCaseCaptcha)) {
+//        if (checkCode == null || !checkCode.toString().equals(lowerCaseCaptcha)) {
-            result.error500("验证码错误");
+//            result.error500("验证码错误");
-            return result;
+//            return result;
-        } else {
+//        } else {
             redisUtil.del(realKey);
-        }
+//        }
         try {
             //解密获取密码和用户名
             password = CommonUtils.decryptBtRsaPriKey(password, rsaPrivateKey);
@@ -105,6 +105,7 @@ public class CompanyLoginController {
         //update-begin-author:wangshuai date:20200601 for: 登录代码验证用户是否注销bug，if条件永远为false
         LambdaQueryWrapper<PayContactsManagement> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(PayContactsManagement::getPhone, PasswordUtil.encrypt(phone));
+        queryWrapper.eq(PayContactsManagement::getDelFlag, 0);
         PayContactsManagement contactsManagement = payContactsManagementService.getOne(queryWrapper);
         //update-end-author:wangshuai date:20200601 for: 登录代码验证用户是否注销bug，if条件永远为false
         if (Objects.isNull(contactsManagement)) {

jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayContactsManagement.java

@@ -146,7 +146,7 @@ public class PayContactsManagement implements Serializable {
     @TableField(exist = false)
     private String flagStatus;
     /**
-     * 删除状态(0为未通过，1为审核通过)只有企业端登录需要判断此字段
+     * 删除状态(0为通过，1为未通过)只有企业端登录需要判断此字段
      */
     @ApiModelProperty(value = "删除状态")
     private String delFlag;

jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentCheck.java

@@ -0,0 +1,97 @@
+package com.jero.payment.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.DecimalMax;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 来款审核
+ */
+@Data
+@TableName("pay_payment_check")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="pay_payment_check对象", description="pay_payment_check")
+public class PayPaymentCheck implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "项目id")
+    @NotEmpty(message = "项目id不能为空")
+    private String projectId;
+
+    @ApiModelProperty(value = "来款记录id")
+    private String recordId;
+
+    @ApiModelProperty(value = "项目类型")
+    @NotEmpty(message = "项目类型不能为空")
+    private Integer projectType;
+
+    @ApiModelProperty(value = "申请人名字")
+    private String applicantName;
+
+    @ApiModelProperty(value = "到账金额")
+    @NotNull(message = "到账金额（元）不能为空")
+    @DecimalMax(value = "9999999999.99",message = "到账金额（元）格式错误")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private BigDecimal amountReceived;
+
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "来款日期")
+    @NotNull(message = "来款日期不能为空")
+    private java.util.Date paymentDate;
+
+    @ApiModelProperty(value = "付款凭证")
+    @NotEmpty(message = "付款凭证不能为空")
+    private String proof;
+
+    @ApiModelProperty(value = "审核结果")
+    private String reviewResult;
+
+    @ApiModelProperty(value = "审核人id")
+    private String reviewerId;
+
+    @ApiModelProperty(value = "审核人姓名")
+    private String reviewerName;
+
+    @ApiModelProperty(value = "审核时间")
+    private String reviewTime;
+
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+}

jero-boot-incoming-payment/src/main/java/com/jero/payment/entity/PayPaymentRecord.java

@@ -17,6 +17,7 @@ import lombok.experimental.Accessors;
 
 import javax.validation.constraints.DecimalMax;
 import javax.validation.constraints.Max;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -55,6 +56,9 @@ public class PayPaymentRecord implements Serializable {
     @ApiModelProperty(value = "来款日期")
     @NotNull(message = "来款日期不能为空")
     private java.util.Date paymentDate;
+    @ApiModelProperty(value = "付款凭证")
+    @NotEmpty(message = "付款凭证不能为空")
+    private String proof;
 	/**备注*/
 	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")

jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java

@@ -406,7 +406,6 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
         }
         //插入来款记录表
         payPaymentRecordMapper.insert(payPaymentRecord);
-//        return Result.OK("添加成功！");
         // 发消息
         // 获取项目负责人，发送消息
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();

jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml

@@ -205,7 +205,7 @@
 
 	<select id="getPayContactsManagementByPhone" resultType="com.jero.modules.pay.company.entity.PayContactsManagement">
 		select *
-		from pay_contacts_management where phone = #{username};
+		from pay_contacts_management where phone = #{username} and del_flag = 0;
 	</select>
 
 	<update id="forgetPassword">