From 84183ee59615be283aa36a36c93bb357d9646d08 Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Mon, 9 Feb 2026 14:11:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=89=A9=E8=AF=A6=E6=83=85=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=A7=93=E5=90=8D=E5=92=8C=E5=95=86=E5=93=81=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StatisticsController.java | 2 +- .../dao/TCustomerApplyCurriculumMapper.java | 20 +++++ .../dao/TCustomerCommodityOrderMapper.java | 20 +++++ .../entity/TCustomerApplyCurriculum.java | 62 +++++++++++++++ .../entity/TCustomerCommodityOrder.java | 76 +++++++++++++++++++ .../ITCustomerApplyCurriculumService.java | 16 ++++ .../ITCustomerCommodityOrderService.java | 16 ++++ .../service/impl/OrdersServiceImpl.java | 19 ++++- .../TCustomerApplyCurriculumServiceImpl.java | 20 +++++ .../TCustomerCommodityOrderServiceImpl.java | 20 +++++ 10 files changed, 269 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/zmzm/finance/common/dao/TCustomerApplyCurriculumMapper.java create mode 100644 src/main/java/com/zmzm/finance/common/dao/TCustomerCommodityOrderMapper.java create mode 100644 src/main/java/com/zmzm/finance/common/entity/TCustomerApplyCurriculum.java create mode 100644 src/main/java/com/zmzm/finance/common/entity/TCustomerCommodityOrder.java create mode 100644 src/main/java/com/zmzm/finance/common/service/ITCustomerApplyCurriculumService.java create mode 100644 src/main/java/com/zmzm/finance/common/service/ITCustomerCommodityOrderService.java create mode 100644 src/main/java/com/zmzm/finance/common/service/impl/TCustomerApplyCurriculumServiceImpl.java create mode 100644 src/main/java/com/zmzm/finance/common/service/impl/TCustomerCommodityOrderServiceImpl.java diff --git a/src/main/java/com/zmzm/finance/common/controller/StatisticsController.java b/src/main/java/com/zmzm/finance/common/controller/StatisticsController.java index 4dcade1..3c5c3e8 100644 --- a/src/main/java/com/zmzm/finance/common/controller/StatisticsController.java +++ b/src/main/java/com/zmzm/finance/common/controller/StatisticsController.java @@ -464,7 +464,7 @@ public class StatisticsController { Row row = sheet.createRow(cell); int q=0; for (Map.Entry m:map.entrySet()){ - row.createCell(q).setCellValue(m.getValue().toString()); + row.createCell(q).setCellValue(m.getValue()==null?"":m.getValue().toString()); q++; } //序号自增 diff --git a/src/main/java/com/zmzm/finance/common/dao/TCustomerApplyCurriculumMapper.java b/src/main/java/com/zmzm/finance/common/dao/TCustomerApplyCurriculumMapper.java new file mode 100644 index 0000000..c134f64 --- /dev/null +++ b/src/main/java/com/zmzm/finance/common/dao/TCustomerApplyCurriculumMapper.java @@ -0,0 +1,20 @@ +package com.zmzm.finance.common.dao; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zmzm.finance.common.entity.TCustomerApplyCurriculum; +import org.apache.ibatis.annotations.Mapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author baomidou + * @since 2026-01-19 + */ +@Mapper +@DS("yljk") +public interface TCustomerApplyCurriculumMapper extends BaseMapper { + +} diff --git a/src/main/java/com/zmzm/finance/common/dao/TCustomerCommodityOrderMapper.java b/src/main/java/com/zmzm/finance/common/dao/TCustomerCommodityOrderMapper.java new file mode 100644 index 0000000..d2509bf --- /dev/null +++ b/src/main/java/com/zmzm/finance/common/dao/TCustomerCommodityOrderMapper.java @@ -0,0 +1,20 @@ +package com.zmzm.finance.common.dao; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zmzm.finance.common.entity.TCustomerCommodityOrder; +import org.apache.ibatis.annotations.Mapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author baomidou + * @since 2026-02-09 + */ +@Mapper +@DS("yljk") +public interface TCustomerCommodityOrderMapper extends BaseMapper { + +} diff --git a/src/main/java/com/zmzm/finance/common/entity/TCustomerApplyCurriculum.java b/src/main/java/com/zmzm/finance/common/entity/TCustomerApplyCurriculum.java new file mode 100644 index 0000000..9f0bbf3 --- /dev/null +++ b/src/main/java/com/zmzm/finance/common/entity/TCustomerApplyCurriculum.java @@ -0,0 +1,62 @@ +package com.zmzm.finance.common.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.Date; + +/** + *

+ * + *

+ * + * @author baomidou + * @since 2026-01-19 + */ +@Getter +@Setter +@ToString +@TableName("t_customer_apply_curriculum") +public class TCustomerApplyCurriculum implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("oid") + private String oid; + + private String description; + + private Date invaliddate; + + private Boolean valid; + + private Integer version; + + private Date createdate; + + private String curriculumid; + + private String paymode; + + private Integer point; + + private BigDecimal money; + + private String invitecode; + + private String status; + + private String curriculumoid; + + private String customeroid; + + private Integer coupon; + + private Integer coursecoupon; +} diff --git a/src/main/java/com/zmzm/finance/common/entity/TCustomerCommodityOrder.java b/src/main/java/com/zmzm/finance/common/entity/TCustomerCommodityOrder.java new file mode 100644 index 0000000..18c764c --- /dev/null +++ b/src/main/java/com/zmzm/finance/common/entity/TCustomerCommodityOrder.java @@ -0,0 +1,76 @@ +package com.zmzm.finance.common.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.util.Date; + +/** + *

+ * + *

+ * + * @author baomidou + * @since 2026-02-09 + */ +@Getter +@Setter +@ToString +@TableName("t_customer_commodity_order") +public class TCustomerCommodityOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("oid") + private String oid; + + private String description; + + private Date invaliddate; + + private Boolean valid; + + private Integer version; + + private Date createdate; + + private String orderid; + + private String paymode; + + private Integer point; + + private BigDecimal money; + + private BigDecimal totalprice; + + private BigDecimal freight; + + private String consignee; + + private String phone; + + private String addressinfo; + + private String payway; + + private String receiptflg; + + private String receipt; + + private String remark; + + private String expressid; + + private String expressdetail; + + private String status; + + private String customeroid; +} diff --git a/src/main/java/com/zmzm/finance/common/service/ITCustomerApplyCurriculumService.java b/src/main/java/com/zmzm/finance/common/service/ITCustomerApplyCurriculumService.java new file mode 100644 index 0000000..f1231a8 --- /dev/null +++ b/src/main/java/com/zmzm/finance/common/service/ITCustomerApplyCurriculumService.java @@ -0,0 +1,16 @@ +package com.zmzm.finance.common.service; + +import com.zmzm.finance.common.entity.TCustomerApplyCurriculum; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author baomidou + * @since 2026-01-19 + */ +public interface ITCustomerApplyCurriculumService extends IService { + +} diff --git a/src/main/java/com/zmzm/finance/common/service/ITCustomerCommodityOrderService.java b/src/main/java/com/zmzm/finance/common/service/ITCustomerCommodityOrderService.java new file mode 100644 index 0000000..9aa1f78 --- /dev/null +++ b/src/main/java/com/zmzm/finance/common/service/ITCustomerCommodityOrderService.java @@ -0,0 +1,16 @@ +package com.zmzm.finance.common.service; + +import com.zmzm.finance.common.entity.TCustomerCommodityOrder; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author baomidou + * @since 2026-02-09 + */ +public interface ITCustomerCommodityOrderService extends IService { + +} diff --git a/src/main/java/com/zmzm/finance/common/service/impl/OrdersServiceImpl.java b/src/main/java/com/zmzm/finance/common/service/impl/OrdersServiceImpl.java index 1456869..6c35374 100644 --- a/src/main/java/com/zmzm/finance/common/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/zmzm/finance/common/service/impl/OrdersServiceImpl.java @@ -42,6 +42,8 @@ public class OrdersServiceImpl extends ServiceImpl impleme @Autowired private TCustomerTaihuClassMapper customerTaihuClassMapper; @Autowired + private TCustomerCommodityOrderMapper customerCommodityOrderMapper; + @Autowired private WumenUserDao wumenUserDao; @Override @@ -502,12 +504,27 @@ public class OrdersServiceImpl extends ServiceImpl impleme List> physicalInfoList = this.baseMapper.selectMaps(new MPJLambdaWrapper() .leftJoin(PaymentToOrder.class,PaymentToOrder::getOrderId,Orders::getId) .leftJoin(Payment.class,Payment::getId,PaymentToOrder::getPaymentId) + .leftJoin("e_book_test.user u on u.tel = t.tel") .disableSubLogicDel() .eq(Orders::getUseFlag,1).eq(Orders::getType,3) .apply("DATE_FORMAT(t.order_time, '%Y-%m') = '"+params.get("year")+"-"+params.get("month")+"'") .select("DATE_FORMAT(order_time, '%Y-%m-%d %H:%i:%s') 01时间,if(source=0,'一路健康',if(source=1,'吴门医述','管理员')) 02来源," + - "IF(t.pay_type=1,'天医币',IF(t2.type=0,'微信',IF(t2.type=1,'支付宝','银行'))) 03类型,tel 04电话,order_sn 05订单号,t.fee 06金额") + "IF(t.pay_type=1,'天医币',IF(t2.type=0,'微信',IF(t2.type=1,'支付宝','银行'))) 03类型,t.tel 04电话,order_sn 05订单号,t.fee 06金额," + + "u.name 07姓名 ,IF(source=1,(select GROUP_CONCAT(sp.product_name,'*',bop.quantity) productName from e_book.buy_order bo left join e_book.buy_order_product bop on bop.order_id = bo.order_id left join e_book.shop_product sp on sp.product_id = bop.product_id where bo.order_id = t.order_old_id and sp.goods_type != '05' group by bo.order_id),IF(source=2,(select CONCAT(product_name,'*1') from finance_order where id = t.order_old_id),'')) 08商品") .orderByAsc(Orders::getOrderTime)); + for (Map m:physicalInfoList){ + if("一路健康".equals(m.get("02来源").toString())){ + List> c = customerCommodityOrderMapper.selectMaps(new MPJLambdaWrapper() + .leftJoin("t_customer_commodity_orderdetail t2 on t2.orderOid = t.oid") + .leftJoin("t_commodity t3 on t3.oid = t2.commodityoid") + .select("GROUP_CONCAT(t3.nameCN) productName,t2.amount count") + .apply("t.orderID = '"+m.get("05订单号")+"'") + .groupBy("t.oid")); + if (c.size()>0){ + m.put("08商品",c.get(0).get("productName")+"*"+c.get(0).get("count")); + } + } + } return physicalInfoList; } diff --git a/src/main/java/com/zmzm/finance/common/service/impl/TCustomerApplyCurriculumServiceImpl.java b/src/main/java/com/zmzm/finance/common/service/impl/TCustomerApplyCurriculumServiceImpl.java new file mode 100644 index 0000000..8bbe81c --- /dev/null +++ b/src/main/java/com/zmzm/finance/common/service/impl/TCustomerApplyCurriculumServiceImpl.java @@ -0,0 +1,20 @@ +package com.zmzm.finance.common.service.impl; + +import com.zmzm.finance.common.entity.TCustomerApplyCurriculum; +import com.zmzm.finance.common.dao.TCustomerApplyCurriculumMapper; +import com.zmzm.finance.common.service.ITCustomerApplyCurriculumService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author baomidou + * @since 2026-01-19 + */ +@Service +public class TCustomerApplyCurriculumServiceImpl extends ServiceImpl implements ITCustomerApplyCurriculumService { + +} diff --git a/src/main/java/com/zmzm/finance/common/service/impl/TCustomerCommodityOrderServiceImpl.java b/src/main/java/com/zmzm/finance/common/service/impl/TCustomerCommodityOrderServiceImpl.java new file mode 100644 index 0000000..d679ae3 --- /dev/null +++ b/src/main/java/com/zmzm/finance/common/service/impl/TCustomerCommodityOrderServiceImpl.java @@ -0,0 +1,20 @@ +package com.zmzm.finance.common.service.impl; + +import com.zmzm.finance.common.entity.TCustomerCommodityOrder; +import com.zmzm.finance.common.dao.TCustomerCommodityOrderMapper; +import com.zmzm.finance.common.service.ITCustomerCommodityOrderService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author baomidou + * @since 2026-02-09 + */ +@Service +public class TCustomerCommodityOrderServiceImpl extends ServiceImpl implements ITCustomerCommodityOrderService { + +}