From fd963b85361ba42f1b28479f5c445528bf0437c4 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Wed, 27 Nov 2024 16:30:07 +0800 Subject: [PATCH] fix --- .../market/WxFinanceController.java | 10 ++++- .../market/WxUserResumeController.java | 42 ++++++++++++++++++- .../com/iformall/domain/po/WxUserResume.java | 15 +++++++ .../iformall/enums/EnumUserResumeStatus.java | 42 +++++++++++++++++++ .../service/impl/WxFinanceServiceImpl.java | 5 +++ .../resources/mapper/WxUserResumeMapper.xml | 12 +++++- 6 files changed, 121 insertions(+), 5 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumUserResumeStatus.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java index fdb2f25af..c02857125 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -313,8 +313,14 @@ public class WxFinanceController extends BaseController { if (!this.isValidPayTime(record.getReceiveDate(),record)) { return new ResultData(Result.ERROR,"支付时间已结账,不允许操作"); } - Map map = wxFinanceService.createReceive(record,this.getUser()); - return new ResultData(map); + + try { + Map map = wxFinanceService.createReceive(record,this.getUser()); + return new ResultData(map); + }catch(Exception e) { + logger.error("createReceive error.",e); + return new ResultData(Result.ERROR,e.getMessage()); + } } @ApiOperation("更新收款单时间") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxUserResumeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxUserResumeController.java index bcada6028..4a49822e8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxUserResumeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxUserResumeController.java @@ -1,16 +1,27 @@ package com.iformall.controller.market; import com.github.pagehelper.PageInfo; +import com.iformall.annotation.SystemControllerLog; +import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.dto.WxUserCouponDto; import com.iformall.domain.po.WxUserResume; import com.iformall.domain.po.base.BaseEntity; +import com.iformall.enums.EnumShopSellStatus; +import com.iformall.enums.EnumUserResumeStatus; import com.iformall.service.WxUserResumeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -25,6 +36,19 @@ public class WxUserResumeController extends BaseController { @Autowired private WxUserResumeService wxUserResumeService; + + @GetMapping("statusList") + public ResultData statusList() { + List list = new ArrayList(); + for (EnumUserResumeStatus t : EnumUserResumeStatus.values()) { + Map m = new HashMap(); + m.put("id", t.getCode()); + m.put("name", t.getMessage()); + list.add(m); + } + return new ResultData(list); + } + @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @@ -33,10 +57,24 @@ public class WxUserResumeController extends BaseController { public ResultData list(@ModelAttribute WxUserResume record, Integer pageNum, Integer pageSize) { if (null == record) record = new WxUserResume(); record.updateTenantInfo(getTenantInfo()); - record.setSortColumns(BaseEntity.SortField.Id_DESC); + record.setSortColumns("update_time desc"); PageInfo page = wxUserResumeService.listAsPage(record, pageNum, pageSize); return new ResultData(page); } - + @ApiOperation("设置状态") + @PostMapping("setStatus") + public ResultData setStatus(@RequestBody WxUserResume record) { + record.updateTenantInfo(getTenantInfo()); + wxUserResumeService.saveOrUpdate(record); + return new ResultData(); + } + + @ApiOperation("设置是否已联系") + @PostMapping("setContracted") + public ResultData setContracted(@RequestBody WxUserResume record) { + record.updateTenantInfo(getTenantInfo()); + wxUserResumeService.saveOrUpdate(record); + return new ResultData(); + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxUserResume.java b/mallinkService/src/main/java/com/iformall/domain/po/WxUserResume.java index 6ce3ccf5c..60300f646 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxUserResume.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxUserResume.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumCUserBaseInfoSex; +import com.iformall.enums.EnumUserResumeStatus; import com.iformall.utils.DateUtils; import lombok.Data; @@ -67,4 +68,18 @@ public class WxUserResume extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="",name="updateTime") private Date updateTime; + @io.swagger.annotations.ApiModelProperty(value="EnumUserResumeStatus",name="sex") + public Integer status; + @TableField(exist = false) + private String statusName; + public String getStatusName() { + if (null != status) { + return EnumUserResumeStatus.getEnum(status).getMessage(); + } + return null; + } + + @io.swagger.annotations.ApiModelProperty(value="是否联系过",name="isContracted") + public Integer isContracted; + } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumUserResumeStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumUserResumeStatus.java new file mode 100644 index 000000000..9badc20c7 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumUserResumeStatus.java @@ -0,0 +1,42 @@ +package com.iformall.enums; + +public enum EnumUserResumeStatus { + AUDITINT(0, "审核中"), + AUDITED(1, "审核通过"), + REJECT(2,"审核拒绝"), + ; + + private EnumUserResumeStatus(Integer code, String message) { + this.code = code; + this.message = message; + } + + private Integer code; + private String message; + + public static EnumUserResumeStatus getEnum(Integer code) { + for (EnumUserResumeStatus value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public Integer getCode() { + return code; + } + + public void setCode(Integer code) { + this.code = code; + } + +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java index 1ce9353d5..4d87c72bb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -680,6 +680,11 @@ public class WxFinanceServiceImpl implements WxFinanceService { } } } + + //TODO 校验金额+减免是不是超过了应收费用 + + + //冲抵总金额 BigDecimal setOffTotal = new BigDecimal(0); List bills = record.getBills(); diff --git a/mallinkService/src/main/resources/mapper/WxUserResumeMapper.xml b/mallinkService/src/main/resources/mapper/WxUserResumeMapper.xml index 9c93c535d..968a8a056 100644 --- a/mallinkService/src/main/resources/mapper/WxUserResumeMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxUserResumeMapper.xml @@ -15,11 +15,13 @@ + + `id`,`tenant_id`,`parent_tenant_id`,`user_id`,`user_phone`,`user_name`,`file_name`,`file_path`,`content`, - `sex`,`birth_day`,`create_time`,`update_time` + `sex`,`birth_day`,`create_time`,`update_time`,`status`,`is_contracted` @@ -44,6 +46,14 @@ and `sex` = #{sex} + + and `status` = #{status} + + + + and `is_contracted` = #{isContracted} + + and `user_phone` like concat('%', #{userPhone},'%')