angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 商品详情添加体系字段；调整字段注释；

This commit is contained in:
cabbage 2025-06-17 13:42:46 +08:00
parent c54535149a
commit 25402eabe1
14 changed files with 46 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderController.java
View File

@ -41,12 +41,6 @@ import java.util.stream.Collectors;
/**
* 订单控制类
*
* @author: sui q
* @time: 2022/8/27 16:20
* @description:
* @classname: OrderController
* @package_name: com.hzs.sale.order.controller
*/
@RestController
@RequestMapping("/manage/order")
@ -56,14 +50,14 @@ public class SaOrderController extends ParentOrderController {
@Autowired
private ITransactionCommonService iTransactionCommonService;
@Autowired
private ISaOrderService orderService;
private ISaOrderService iSaOrderService;
@Autowired
private ISaOrderItemsService orderItemsService;
private ISaOrderItemsService iSaOrderItemsService;
@Autowired
private ISaOrderRemarksService orderRemarksService;
private ISaOrderRemarksService iSaOrderRemarksService;
@DubboReference
IAreaServiceApi areaServiceApi;
IAreaServiceApi iAreaServiceApi;
@DubboReference
IUserServiceApi iUserServiceApi;
@DubboReference
@ -90,7 +84,7 @@ public class SaOrderController extends ParentOrderController {
if (waresOrderParam.getEndPayDate() != null) {
waresOrderParam.setEndPayDate(DateUtils.getEndTime(waresOrderParam.getEndPayDate()));
}
Map<Integer, String> areaMap = areaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData();
Map<Integer, String> areaMap = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData();
waresOrderParam.setPkCountry(SecurityUtils.getPkCountry());
// 获取管理员权限（角色地区范围、体系列表、团队列表）
@ -100,7 +94,7 @@ public class SaOrderController extends ParentOrderController {
waresOrderParam.setTeamList(userAuthorityDTO.getUserTeamList());
startPage();
List<WaresOrderVo> resultList = orderService.selectByOrderInfoList(waresOrderParam);
List<WaresOrderVo> resultList = iSaOrderService.selectByOrderInfoList(waresOrderParam);
for (WaresOrderVo waresOrderVo : resultList) {
// 省
@ -183,7 +177,7 @@ public class SaOrderController extends ParentOrderController {
if (waresOrderParam.getEndPayDate() != null) {
waresOrderParam.setEndPayDate(DateUtils.getEndTime(waresOrderParam.getEndPayDate()));
}
Map<Integer, String> areaMap = areaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData();
Map<Integer, String> areaMap = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData();
waresOrderParam.setPkCountry(SecurityUtils.getPkCountry());
// 获取管理员权限（角色地区范围、体系列表、团队列表）
@ -191,10 +185,10 @@ public class SaOrderController extends ParentOrderController {
waresOrderParam.setAreaScopeList(userAuthorityDTO.getRoleAreaScopeList());
waresOrderParam.setVertexIdList(userAuthorityDTO.getVertexIdList());
waresOrderParam.setTeamList(userAuthorityDTO.getUserTeamList());
// startPage();
List<WaresOrderVo> resultList = orderService.selectByOrderInfoList(waresOrderParam);
List<WaresOrderVo> resultList = iSaOrderService.selectByOrderInfoList(waresOrderParam);
// 获取需要翻译的枚举翻译
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EDelivery.values(), ESupplyWay.values(), ETransportType.values(), EPresaleStatus.values(), EOrderType.values(), EOrderStatus.values(), EOrderPayType.values(), ESaleType.values(), EShippingChannel.values());
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EOrderType.values(), EShippingChannel.values());
for (WaresOrderVo waresOrderVo : resultList) {
// 省
if (waresOrderVo.getRecProvince() != null) {
@ -242,7 +236,7 @@ public class SaOrderController extends ParentOrderController {
waresOrderVo.setLogisticsCode(waresOrderVo.getLogisticsCode());
waresOrderVo.setLogisticsCompany(waresOrderVo.getLogisticsCompany());
}
ExcelUtil<WaresOrderVo> util = new ExcelUtil<WaresOrderVo>(WaresOrderVo.class, iMenuColumnServiceApi.queryMenuColumn("Commodity", SecurityUtils.getUserId()).getData());
ExcelUtil<WaresOrderVo> util = new ExcelUtil<>(WaresOrderVo.class, iMenuColumnServiceApi.queryMenuColumn("Commodity", SecurityUtils.getUserId()).getData());
util.exportExcel(response, resultList, "商品订单导出");
}
@ -269,10 +263,10 @@ public class SaOrderController extends ParentOrderController {
// 获取需要翻译的枚举翻译
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EDelivery.values(), ESupplyWay.values());
Map<Integer, String> areaMap = areaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData();
Map<Integer, String> areaMap = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData();
startPage();
List<WaresOrderVo> resultList = orderItemsService.selectByInvestmentList(waresOrderParam);
List<WaresOrderVo> resultList = iSaOrderItemsService.selectByInvestmentList(waresOrderParam);
for (WaresOrderVo waresOrderVo : resultList) {
// 省
if (waresOrderVo.getRecProvince() != null) {
@ -353,11 +347,11 @@ public class SaOrderController extends ParentOrderController {
waresOrderParam.setEndCreateDate(DateUtils.getEndTime(waresOrderParam.getEndCreateDate()));
}
Map<Integer, String> areaMap = areaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData();
Map<Integer, String> areaMap = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData();
// 获取需要翻译的枚举翻译
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EDelivery.values(), ESupplyWay.values());
List<WaresOrderVo> resultList = orderItemsService.selectByInvestmentList(waresOrderParam);
List<WaresOrderVo> resultList = iSaOrderItemsService.selectByInvestmentList(waresOrderParam);
for (WaresOrderVo waresOrderVo : resultList) {
// 省
if (waresOrderVo.getRecProvince() != null) {
@ -493,11 +487,11 @@ public class SaOrderController extends ParentOrderController {
* @param param
*/
private void handleOrderSelect(List<OrderSelectVO> resultList, OrderSelectParam param) {
List<SaOrderItemsExt> saOrderItemsExtList = orderService.queryOrderSelect(param, SecurityUtils.getPkCountry());
List<SaOrderItemsExt> saOrderItemsExtList = iSaOrderService.queryOrderSelect(param, SecurityUtils.getPkCountry());
if (CollectionUtil.isNotEmpty(saOrderItemsExtList)) {
// 调用system服务，获取地址
Map<Integer, String> areaMap = areaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData();
Map<Integer, String> areaMap = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData();
for (SaOrderItemsExt saOrderItemsExt : saOrderItemsExtList) {
OrderSelectVO orderSelectVO = BeanUtil.copyProperties(saOrderItemsExt, OrderSelectVO.class);
@ -511,20 +505,20 @@ public class SaOrderController extends ParentOrderController {
/**
* 添加订单备注
*/
@PostMapping("update-order-remarks")
@PostMapping("/update-order-remarks")
public AjaxResult updateOrderRemarks(@RequestBody SaOrderRemarks saOrderRemarks) {
SaOrderRemarks orderRemarks = orderRemarksService.getOne(new LambdaQueryWrapper<SaOrderRemarks>().eq(SaOrderRemarks::getPkOrder, saOrderRemarks.getPkOrder()));
SaOrderRemarks orderRemarks = iSaOrderRemarksService.getOne(new LambdaQueryWrapper<SaOrderRemarks>().eq(SaOrderRemarks::getPkOrder, saOrderRemarks.getPkOrder()));
if (orderRemarks == null) {
saOrderRemarks.setCreationTime(DateUtils.currentDateTime());
saOrderRemarks.setPkCountry(SecurityUtils.getPkCountry());
saOrderRemarks.setPkCreator(SecurityUtils.getUserId());
saOrderRemarks.setStatus(EYesNo.NO.getIntValue());
orderRemarksService.save(saOrderRemarks);
iSaOrderRemarksService.save(saOrderRemarks);
} else {
orderRemarks.setModifiedTime(DateUtils.currentDateTime());
orderRemarks.setPkModified(SecurityUtils.getUserId());
orderRemarks.setRemarks(saOrderRemarks.getRemarks());
orderRemarksService.update(orderRemarks, new LambdaQueryWrapper<SaOrderRemarks>().eq(SaOrderRemarks::getPkOrder, saOrderRemarks.getPkOrder()));
iSaOrderRemarksService.update(orderRemarks, new LambdaQueryWrapper<SaOrderRemarks>().eq(SaOrderRemarks::getPkOrder, saOrderRemarks.getPkOrder()));
}
return AjaxResult.success();
}
@ -532,7 +526,7 @@ public class SaOrderController extends ParentOrderController {
/**
* 单品销量列表
*/
@GetMapping("single-item-stat")
@GetMapping("/single-item-stat")
public TableDataInfo singleItemStat(SingleItemStatParam singleItemStatParam) {
if (StringUtils.isBlank(singleItemStatParam.getSkuCode())
&& StringUtils.isBlank(singleItemStatParam.getProductName())
@ -560,7 +554,7 @@ public class SaOrderController extends ParentOrderController {
singleItemStatParam.setEndPayDateStr(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.getEndTime(DateUtils.addDate(nowDate, 1))));
}
startPage();
List<SingleItemStatVo> singleItemStatList = orderService.singleItemStat(singleItemStatParam);
List<SingleItemStatVo> singleItemStatList = iSaOrderService.singleItemStat(singleItemStatParam);
for (SingleItemStatVo singleItemStat : singleItemStatList) {
singleItemStat.setTotal(singleItemStat.getGiftQuantity() + singleItemStat.getProductQuantity());
}
@ -573,7 +567,7 @@ public class SaOrderController extends ParentOrderController {
* @param singleItemStatParam
* @param
*/
@GetMapping("get-single-item-stat-total")
@GetMapping("/get-single-item-stat-total")
public AjaxResult getSingleItemStatTotal(SingleItemStatParam singleItemStatParam) {
if (StringUtils.isBlank(singleItemStatParam.getSkuCode())
&& StringUtils.isBlank(singleItemStatParam.getProductName())
@ -609,7 +603,7 @@ public class SaOrderController extends ParentOrderController {
// 总计
Integer total = 0;
// 查询计算总计
List<SingleItemStatVo> siList = orderService.singleItemStat(singleItemStatParam);
List<SingleItemStatVo> siList = iSaOrderService.singleItemStat(singleItemStatParam);
for (SingleItemStatVo singleItemStatVo : siList) {
singleItemStatVo.setTotal(singleItemStatVo.getGiftQuantity() + singleItemStatVo.getProductQuantity());
waresQuantity += singleItemStatVo.getWaresQuantity();
@ -631,7 +625,7 @@ public class SaOrderController extends ParentOrderController {
/**
* 订单单品统计导出
*/
@PostMapping("single-item-stat-export")
@PostMapping("/single-item-stat-export")
public void singleItemStatExport(SingleItemStatParam singleItemStatParam, HttpServletResponse response) {
if (StringUtils.isBlank(singleItemStatParam.getSkuCode())
@ -661,7 +655,7 @@ public class SaOrderController extends ParentOrderController {
singleItemStatParam.setEndPayDateStr(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.getEndTime(DateUtils.addDate(nowDate, 1))));
}
List<SingleItemStatVo> singleItemStatList = orderService.singleItemStat(singleItemStatParam);
List<SingleItemStatVo> singleItemStatList = iSaOrderService.singleItemStat(singleItemStatParam);
int waresQuantity = 0;
// 产品数量
@ -723,9 +717,9 @@ public class SaOrderController extends ParentOrderController {
param.setTeamList(userAuthorityDTO.getUserTeamList());
startPage();
List<OrderInvoicingVO> resultList = orderService.listOrderInvoicing(param);
List<OrderInvoicingVO> resultList = iSaOrderService.listOrderInvoicing(param);
Map<Integer, String> areaMap = areaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData();
Map<Integer, String> areaMap = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData();
for (OrderInvoicingVO vo : resultList) {
// 地区处理
if (vo.getRecProvince() != null) {

3
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderRemarksMapper.java
View File

@ -5,9 +5,6 @@ import com.hzs.common.domain.sale.order.SaOrderRemarks;
/**
* 订单备注信息（订单表一对一） Mapper 接口
*
* @author hzs
* @since 2023-09-18
*/
public interface SaOrderRemarksMapper extends BaseMapper<SaOrderRemarks> {

6
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/WaresOrderParam.java
View File

@ -7,11 +7,7 @@ import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* @Description: 商品订单的查询条件
* @Author: yuhui
* @Time: 2023/1/31 14:10
* @Classname: WaresOrderParam
* @PackageName: com.hzs.sale.order.param
* 商品订单的查询条件
*/
@EqualsAndHashCode(callSuper = true)
@Data

5
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderItemsService.java
View File

@ -19,9 +19,6 @@ import java.util.List;
/**
* 销售订单-明细表 服务类
*
* @author hzs
* @since 2022-08-31
*/
public interface ISaOrderItemsService extends IService<SaOrderItems> {
@ -104,7 +101,7 @@ public interface ISaOrderItemsService extends IService<SaOrderItems> {
/**
* 根据订单ID查询订单明细列表
*
* @param orderIdList 订单ID列表
* @param orderIdList 订单ID列表
* @return
*/
List<SaOrderItemsExt> queryListByOrderId(List<Long> orderIdList);

3
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderRemarksService.java
View File

@ -5,9 +5,6 @@ import com.hzs.common.domain.sale.order.SaOrderRemarks;
/**
* 订单备注信息（订单表一对一） 服务类
*
* @author hzs
* @since 2023-09-18
*/
public interface ISaOrderRemarksService extends IService<SaOrderRemarks> {

3
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderItemsServiceImpl.java
View File

@ -25,9 +25,6 @@ import java.util.*;
/**
* 销售订单-明细表 服务实现类
*
* @author hzs
* @since 2022-08-31
*/
@Service
public class SaOrderItemsServiceImpl extends ServiceImpl<SaOrderItemsMapper, SaOrderItems> implements ISaOrderItemsService {

3
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderRemarksServiceImpl.java
View File

@ -8,9 +8,6 @@ import org.springframework.stereotype.Service;
/**
* 订单备注信息（订单表一对一） 服务实现类
*
* @author hzs
* @since 2023-09-18
*/
@Service
public class SaOrderRemarksServiceImpl extends ServiceImpl<SaOrderRemarksMapper, SaOrderRemarks> implements ISaOrderRemarksService {

16
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderInfoVo.java
View File

@ -9,14 +9,6 @@ import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
* @BelongsProject: hzs_cloud
* @BelongsPackage: com.hzs.sale.order.vo
* @Author: yh
* @CreateTime: 2023-08-02 16:32
* @Description: TODO
* @Version: 1.0
*/
@Data
public class WaresOrderInfoVo implements Serializable {
@ -106,9 +98,15 @@ public class WaresOrderInfoVo implements Serializable {
/**
* 会员名称
*/
@Excel(name = "会员名称")
@Excel(name = "会员姓名")
private String memberName;
/**
* 隶属体系
*/
@Excel(name = "隶属体系")
private String vertexName;
/**
* 联系方式
*/

10
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderVo.java
View File

@ -10,29 +10,19 @@ import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
* @Description:
* @Author: yuhui
* @Time: 2023/1/31 14:09
* @Classname: WaresOrderVo
* @PackageName: com.hzs.sale.order.vo
*/
@Data
public class WaresOrderVo implements Serializable {
/**
* 产品主图
*/
// @Excel(name = "产品主图")
private String cover1;
/**
* 产品名称
*/
// @Excel(name = "产品名称")
private String waresName;
/**
* 产品单价
*/

7
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDelivery.java
View File

@ -4,13 +4,8 @@ import com.hzs.common.core.constant.EnumsPrefixConstants;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* @Description: 发货方式
* @Author: sui q
* @Time: 2022/8/31 9:07
* @Classname: EDelivery
* @PackageName: com.hzs.common.core.enums
* 发货方式
*/
@AllArgsConstructor
@Getter

15
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPresaleStatus.java
View File

@ -5,11 +5,7 @@ import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* @Description: 预售状态
* @Author: jiang chao
* @Time: 2022/11/4 14:05
* @Classname: EPresaleStatus
* @PackageName: com.hzs.common.core.enums
* 预售状态
*/
@AllArgsConstructor
@Getter
@ -25,11 +21,6 @@ public enum EPresaleStatus {
*/
PRESALE(1, "预售", 0, EnumsPrefixConstants.PRESALE_STATUS + "1"),
/**
* 已售罄 2.0删除该项 已对接过设计
*/
// SOLD_OUT(2, "已售罄", 0, EnumsPrefixConstants.PRESALE_STATUS + "2"),
/**
* 缺货
*/
@ -54,9 +45,9 @@ public enum EPresaleStatus {
*/
private final String key;
public static EPresaleStatus getEPresaleStatus(int value ){
public static EPresaleStatus getEPresaleStatus(int value) {
for (EPresaleStatus ePresaleStatus : EPresaleStatus.values()) {
if (ePresaleStatus.getValue() == value){
if (ePresaleStatus.getValue() == value) {
return ePresaleStatus;
}
}

6
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESaleType.java
View File

@ -5,11 +5,7 @@ import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* @Description: 销售类型枚举
* @Author: jiang chao
* @Time: 2023/3/21 14:46
* @Classname: ESaleType
* @PackageName: com.hzs.common.core.enums
* 销售类型枚举
*/
@AllArgsConstructor
@Getter

10
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETransportType.java
View File

@ -5,11 +5,7 @@ import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* @Description: 运输类型
* @Author: sui q
* @Time: 2022/9/15 14:30
* @Classname: ETransportType
* @PackageName: com.hzs.common.core.enums
* 运输类型
*/
@AllArgsConstructor
@Getter
@ -48,9 +44,9 @@ public enum ETransportType {
private final String key;
public static ETransportType getETransportType(int value){
public static ETransportType getETransportType(int value) {
for (ETransportType eTransportType : ETransportType.values()) {
if (eTransportType.getValue() == value){
if (eTransportType.getValue() == value) {
return eTransportType;
}
}

5
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/order/SaOrderRemarks.java
View File

@ -10,12 +10,7 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
* 订单备注信息（订单表一对一）
* </p>
*
* @author hzs
* @since 2023-09-18
*/
@Data
@EqualsAndHashCode(callSuper = true)