r
/
hangtag
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新修改地址

This commit is contained in:
wwb 2024-12-14 17:51:45 +08:00
parent 90e9d7bbc5
commit af39aca752
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/app/AppSaleOrderController.java
View File

@ -2,6 +2,7 @@ package cn.hangtag.module.oms.controller.admin.app;
import cn.hangtag.framework.apilog.core.annotation.ApiAccessLog;
import cn.hangtag.framework.common.exception.ErrorCode;
import cn.hangtag.framework.common.pojo.CommonResult;
import cn.hangtag.framework.common.pojo.PageParam;
import cn.hangtag.framework.common.pojo.PageResult;
@ -36,6 +37,7 @@ import java.util.List;
import java.util.Map;
import static cn.hangtag.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.hangtag.framework.common.pojo.CommonResult.error;
import static cn.hangtag.framework.common.pojo.CommonResult.success;
@Tag(name = "APP - 销售订单")
@ -97,9 +99,12 @@ public class AppSaleOrderController{
public CommonResult<PageResult<SaleOrderRespVO>> getSaleOrderPage(@Valid SaleOrderPageReqVO pageReqVO) {
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
CustomerDO customer = customerService.getCustomerByUserId(loginUser.getId());
pageReqVO.setCustomerId(customer.getId());
PageResult<SaleOrderDO> pageResult = saleOrderService.getSaleOrderPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, SaleOrderRespVO.class));
if(customer!=null){
pageReqVO.setCustomerId(customer.getId());
PageResult<SaleOrderDO> pageResult = saleOrderService.getSaleOrderPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, SaleOrderRespVO.class));
}
return error(new ErrorCode(99999,"该用户未绑定客户资料,请联系管理员维护数据！"));
}
@GetMapping("/export-excel")

6
hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
View File

@ -160,6 +160,12 @@ public class SaleOrderServiceImpl implements SaleOrderService {
// 插入
SaleOrderDO saleOrder = BeanUtils.toBean(createReqVO, SaleOrderDO.class);
saleOrder.setOrderStatus(SaleOrderStatusEnum.YXD.getValue());
List<SaleOrderEntryDO> entrys = createReqVO.getEntrys();
String currency = null;
if(entrys!=null&&entrys.size()>0){
currency = entrys.get(0).getCurrency();
}
saleOrder.setCurrency(currency);
saleOrderMapper.insert(saleOrder);
// 插入子表
createSaleOrderEntryList(saleOrder.getId(), createReqVO.getEntrys());

4
hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/controller/admin/auth/vo/AuthMailModifyPwdReqVO.java
View File

@ -1,7 +1,6 @@
package cn.hangtag.module.system.controller.admin.auth.vo;
import cn.hangtag.framework.common.validation.Email;
import cn.hangtag.framework.common.validation.Mobile;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
@ -9,6 +8,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
@Schema(description = "管理后台 - 邮箱验证码的重置密码 Request VO")
@Data
@ -35,7 +35,7 @@ public class AuthMailModifyPwdReqVO {
private String code;
@Schema(description = "账户类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
@NotEmpty(message = "账户类型不能为空")
@NotNull(message = "账户类型不能为空")
private Integer type;
}