xin
2025-07-07 29bf89e3f30c1aaa09b34b1a2b9c572d3c070e29
退货原因状态
5 files modified
13 ■■■■ changed files
oying-system/src/main/java/com/oying/modules/sh/domain/OrderReturnReason.java 2 ●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/sh/domain/dto/OrderReturnReasonQueryCriteria.java 4 ●●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderOperationLogServiceImpl.java 2 ●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnReasonServiceImpl.java 3 ●●●● patch | view | raw | blame | history
oying-system/src/main/resources/mapper/sh/OrderReturnReasonMapper.xml 2 ●●● patch | view | raw | blame | history
oying-system/src/main/java/com/oying/modules/sh/domain/OrderReturnReason.java
@@ -35,7 +35,7 @@
    @NotBlank
    @ApiModelProperty(value = "状态:0->不启用;1->启用")
    private String reasonStatus;
    private Boolean reasonStatus = false;
    public void copy(OrderReturnReason source){
        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
oying-system/src/main/java/com/oying/modules/sh/domain/dto/OrderReturnReasonQueryCriteria.java
@@ -21,8 +21,8 @@
    @ApiModelProperty(value = "退货类型")
    private String reasonName;
    @ApiModelProperty(value = "状态:0->不启用;1->启用")
    private String reasonStatus;
    @ApiModelProperty(value = "状态:false->停用;true->启用")
    private Boolean reasonStatus;
    private List<Timestamp> createTime;
}
oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderOperationLogServiceImpl.java
@@ -65,7 +65,7 @@
        List<Map<String, Object>> list = new ArrayList<>();
        for (OrderOperationLog orderOperationLog : all) {
            Map<String, Object> map = new LinkedHashMap<>();
            map.put("用户id", orderOperationLog.getUserId());
            map.put("用户账号", orderOperationLog.getUsername());
            map.put("用户类型", orderOperationLog.getUserType());
            map.put("用户操作", orderOperationLog.getOperation());
            map.put("备注", orderOperationLog.getRemark());
oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnReasonServiceImpl.java
@@ -2,7 +2,6 @@
import com.oying.modules.sh.domain.OrderReturnReason;
import com.oying.utils.FileUtil;
import com.oying.utils.enums.StatusEnum;
import lombok.RequiredArgsConstructor;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -72,7 +71,7 @@
            Map<String, Object> map = new LinkedHashMap<>();
            map.put("退货类型", orderReturnReason.getReasonName());
            map.put("排序", orderReturnReason.getSort());
            map.put("状态", StatusEnum.getValue(orderReturnReason.getReasonStatus()));
            map.put("状态", orderReturnReason.getReasonStatus() ? "启用" : "停用");
            map.put("创建者", orderReturnReason.getCreateBy());
            map.put("更新者", orderReturnReason.getUpdateBy());
            map.put("创建日期", orderReturnReason.getCreateTime());
oying-system/src/main/resources/mapper/sh/OrderReturnReasonMapper.xml
@@ -37,7 +37,7 @@
        select
        <include refid="Base_Column_List"/>
        from sh_order_return_reason
        where reason_status = '1'
        where reason_status = true
        order by sort desc
    </select>
</mapper>