From b87d1e75d7002843536e9ddf455d9f9fa8d5e4d8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 30 十二月 2024 09:57:40 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes
---
manage/src/main/java/com/jilongda/manage/controller/TAppUserController.java | 8 ++
manage/src/main/resources/mapping/TLensWarehousingDetailMapper.xml | 2
manage/src/main/resources/mapping/TOrderMapper.xml | 3
manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java | 32 ++++++++--
applet/src/main/resources/mapping/TOrderMapper.xml | 5 -
manage/src/main/java/com/jilongda/manage/mapper/TLensWarehousingDetailMapper.java | 2
applet/src/main/java/com/jilongda/applet/model/TOrder.java | 104 ++++++++++++++++++----------------
7 files changed, 93 insertions(+), 63 deletions(-)
diff --git a/applet/src/main/java/com/jilongda/applet/model/TOrder.java b/applet/src/main/java/com/jilongda/applet/model/TOrder.java
index b3c7126..9d9d54e 100644
--- a/applet/src/main/java/com/jilongda/applet/model/TOrder.java
+++ b/applet/src/main/java/com/jilongda/applet/model/TOrder.java
@@ -50,45 +50,45 @@
@TableField("storeId")
private Integer storeId;
- @ApiModelProperty(value = "镜架型号id")
- @TableField("modelId")
- private Integer modelId;
+// @ApiModelProperty(value = "镜架型号id")
+// @TableField("modelId")
+// private Integer modelId;
- @ApiModelProperty(value = "镜架色号")
- @TableField("color")
- private String color;
+// @ApiModelProperty(value = "镜架色号")
+// @TableField("color")
+// private String color;
+//
+// @ApiModelProperty(value = "镜片系列id")
+// @TableField("series")
+// private Integer series;
- @ApiModelProperty(value = "镜片系列id")
- @TableField("series")
- private Integer series;
+// @ApiModelProperty(value = "镜片右 球镜+柱镜 逗号拼接 字段为空 客户自带")
+// @TableField("rLens")
+// private String rLens;
+//
+// @ApiModelProperty(value = "镜片左 球镜+柱镜 逗号拼接 字段为空 客户自带")
+// @TableField("lLens")
+// private String lLens;
- @ApiModelProperty(value = "镜片右 球镜+柱镜 逗号拼接 字段为空 客户自带")
- @TableField("rLens")
- private String rLens;
-
- @ApiModelProperty(value = "镜片左 球镜+柱镜 逗号拼接 字段为空 客户自带")
- @TableField("lLens")
- private String lLens;
-
- @ApiModelProperty(value = "1球 2非球面 3双非")
- @TableField("type")
- private Integer type;
-
- @ApiModelProperty(value = "折射率")
- @TableField("refractiveIndex")
- private String refractiveIndex;
+// @ApiModelProperty(value = "1球 2非球面 3双非")
+// @TableField("type")
+// private Integer type;
+//
+// @ApiModelProperty(value = "折射率")
+// @TableField("refractiveIndex")
+// private String refractiveIndex;
@ApiModelProperty(value = "店铺员工id")
@TableField("sysId")
private Integer sysId;
- @ApiModelProperty(value = "优惠券id")
+ @ApiModelProperty(value = "优惠券领取id")
@TableField("couponId")
private Integer couponId;
-
- @ApiModelProperty(value = "收费项id")
- @TableField("itemsId")
- private Integer itemsId;
+//
+// @ApiModelProperty(value = "收费项id")
+// @TableField("itemsId")
+// private Integer itemsId;
@ApiModelProperty(value = "备注")
@TableField("remark")
@@ -121,6 +121,9 @@
@ApiModelProperty(value = "支付金额")
@TableField("payMoney")
private BigDecimal payMoney;
+ @ApiModelProperty(value = "手续费金额")
+ @TableField("commissionMoney")
+ private BigDecimal commissionMoney;
@ApiModelProperty(value = "是否加工 1是2否")
@TableField("isMachining")
@@ -141,33 +144,34 @@
@ApiModelProperty(value = "核算时间")
@TableField("accountingTime")
private LocalDateTime accountingTime;
-
- @ApiModelProperty(value = "品牌id")
- @TableField("brandId")
- private Integer brandId;
-
- @ApiModelProperty(value = "品牌名称")
- @TableField("brandName")
- private String brandName;
-
- @ApiModelProperty(value = "系列名称")
- @TableField("seriesName")
- private String seriesName;
-
- @ApiModelProperty(value = "型号名称")
- @TableField("modelName")
- private String modelName;
- @ApiModelProperty(value = "手动添加订单-用户姓名")
+ @ApiModelProperty(value = "用户姓名")
@TableField("realName")
private String realName;
- @ApiModelProperty(value = "手动添加订单-用户手机号")
+ @ApiModelProperty(value = "用户手机号")
@TableField("phone")
private String phone;
- @ApiModelProperty(value = "手动添加订单-用户年龄")
+ @ApiModelProperty(value = "用户年龄")
@TableField("age")
private Integer age;
- @ApiModelProperty(value = "手动添加订单-用户性别 1男2女")
+ @ApiModelProperty(value = "用户性别 1男2女")
@TableField("gender")
private Integer gender;
-
+ @ApiModelProperty(value = "微信昵称")
+ @TableField("name")
+ private Integer name;
+ @ApiModelProperty(value = "支付方式")
+ @TableField("payTypeName")
+ private String payTypeName;
+ @ApiModelProperty(value = "手续费扣除")
+ @TableField("commission")
+ private BigDecimal commission;
+ @ApiModelProperty(value = "笨蛋毛利")
+ @TableField("profitMoney")
+ private BigDecimal profitMoney;
+ @ApiModelProperty(value = "毛利率")
+ @TableField("profitRating")
+ private BigDecimal profitRating;
+ @ApiModelProperty(value = "验光来源")
+ @TableField("profitRating")
+ private Integer optometrySource;
}
diff --git a/applet/src/main/resources/mapping/TOrderMapper.xml b/applet/src/main/resources/mapping/TOrderMapper.xml
index ce40bf0..9f5288b 100644
--- a/applet/src/main/resources/mapping/TOrderMapper.xml
+++ b/applet/src/main/resources/mapping/TOrderMapper.xml
@@ -9,7 +9,6 @@
<result column="userId" property="userId" />
<result column="optometryId" property="optometryId" />
<result column="storeId" property="storeId" />
- <result column="modelId" property="modelId" />
<result column="color" property="color" />
<result column="series" property="series" />
<result column="rLens" property="rLens" />
@@ -45,13 +44,13 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, code, userId, optometryId, storeId, modelId, color, series, rLens, lLens, `type`, refractiveIndex,
+ id, code, userId, optometryId, storeId, color, series, rLens, lLens, `type`, refractiveIndex,
createTime, updateTime, createBy, updateBy, isDelete, sysId, couponId, itemsId, remark, isMail, mailName,
mailPhone, mailAddress, orderMoney, couponMoney, payMoney, isMachining, machiningCode, isAccounting, accountingName,
accountingTime,brandId,brandName,seriesName,modelName
</sql>
<select id="pageList" resultType="com.jilongda.applet.vo.TOrderVO">
- select t.id, t.code, t.userId, t.optometryId, t.storeId, t.modelId, t.color, t.series, t.rLens, t.lLens, t.`type`, t.refractiveIndex,
+ select t.id, t.code, t.userId, t.optometryId, t.storeId, t.color, t.series, t.rLens, t.lLens, t.`type`, t.refractiveIndex,
t.createTime, t.updateTime, t.createBy, t.updateBy, t.isDelete, t.sysId, t.couponId, t.itemsId, t.remark, t.isMail, t.mailName,
t.mailPhone, t.mailAddress, t.orderMoney, t.couponMoney, t.payMoney, t.isMachining, t.machiningCode, t.isAccounting, t.accountingName,
t.accountingTime,t.brandId,t.brandName,t.seriesName,t.modelName,ts.name as storeName
diff --git a/manage/src/main/java/com/jilongda/manage/controller/TAppUserController.java b/manage/src/main/java/com/jilongda/manage/controller/TAppUserController.java
index 262af59..1939bff 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TAppUserController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TAppUserController.java
@@ -103,5 +103,13 @@
PageInfo<TAppUserCouponVO> appUserVOPageInfo = couponReceiveService.pageList(query);
return ApiResult.success(appUserVOPageInfo);
}
+
+ @ApiOperation(value = "用户信息修改")
+ @PostMapping(value = "/updateUser")
+ public ApiResult<String> updateUser(@RequestBody TAppUser appUser) {
+ appUserService.updateById(appUser);
+ return ApiResult.success();
+ }
+
}
diff --git a/manage/src/main/java/com/jilongda/manage/mapper/TLensWarehousingDetailMapper.java b/manage/src/main/java/com/jilongda/manage/mapper/TLensWarehousingDetailMapper.java
index 1a26c01..9886993 100644
--- a/manage/src/main/java/com/jilongda/manage/mapper/TLensWarehousingDetailMapper.java
+++ b/manage/src/main/java/com/jilongda/manage/mapper/TLensWarehousingDetailMapper.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.jilongda.manage.query.TWarehousingDetailLensQuery;
import com.jilongda.manage.vo.TLensWarehousingDetailVO;
+import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -17,6 +18,7 @@
* @author 无关风月
* @since 2024-12-09
*/
+@Mapper
public interface TLensWarehousingDetailMapper extends BaseMapper<TLensWarehousingDetail> {
List<TLensWarehousingDetailVO> pageLensList(@Param("query")TWarehousingDetailLensQuery query,@Param("pageInfo") PageInfo<TLensWarehousingDetailVO> pageInfo);
diff --git a/manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java b/manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java
index e84c130..3e10b96 100644
--- a/manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java
+++ b/manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java
@@ -20,8 +20,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* <p>
@@ -45,10 +47,18 @@
public PageInfo<TFrameWarehousingDetailVO> detailList(TWarehousingDetailQuery query) {
PageInfo<TFrameWarehousingDetailVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<TFrameWarehousingDetailVO> list = frameWarehousingDetailMapper.pageList(query,pageInfo);
+ List<Integer> storeIds = list.stream().map(TFrameWarehousingDetailVO::getStoreId).collect(Collectors.toList());
+ List<TStore> stores = new ArrayList<>();
+ if(CollectionUtils.isNotEmpty(storeIds)){
+ stores = storeMapper.selectList(Wrappers.lambdaQuery(TStore.class)
+ .in(TStore::getId,storeIds));
+ }
for (TFrameWarehousingDetailVO tFrameWarehousingDetailVO : list) {
- TStore tStore = storeMapper.selectById(tFrameWarehousingDetailVO.getStoreId());
- if(Objects.nonNull(tStore)){
- tFrameWarehousingDetailVO.setStoreName(tStore.getName());
+ if(CollectionUtils.isNotEmpty(stores)){
+ TStore store = stores.stream().filter(tStore -> tStore.getId().equals(tFrameWarehousingDetailVO.getStoreId())).findFirst().orElse(null);
+ if(Objects.nonNull(store)){
+ tFrameWarehousingDetailVO.setStoreName(store.getName());
+ }
}
}
pageInfo.setRecords(list);
@@ -58,10 +68,18 @@
public PageInfo<TLensWarehousingDetailVO> detailListLens(TWarehousingDetailLensQuery query) {
PageInfo<TLensWarehousingDetailVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<TLensWarehousingDetailVO> list = lensWarehousingDetailMapper.pageLensList(query,pageInfo);
- for (TLensWarehousingDetailVO tFrameWarehousingDetailVO : list) {
- TStore tStore = storeMapper.selectById(tFrameWarehousingDetailVO.getStoreId());
- if(Objects.nonNull(tStore)){
- tFrameWarehousingDetailVO.setStoreName(tStore.getName());
+ List<Integer> storeIds = list.stream().map(TLensWarehousingDetailVO::getStoreId).collect(Collectors.toList());
+ List<TStore> stores = new ArrayList<>();
+ if(CollectionUtils.isNotEmpty(storeIds)){
+ stores = storeMapper.selectList(Wrappers.lambdaQuery(TStore.class)
+ .in(TStore::getId,storeIds));
+ }
+ for (TLensWarehousingDetailVO tLensWarehousingDetailVO : list) {
+ if(CollectionUtils.isNotEmpty(stores)){
+ TStore store = stores.stream().filter(tStore -> tStore.getId().equals(tLensWarehousingDetailVO.getStoreId())).findFirst().orElse(null);
+ if(Objects.nonNull(store)){
+ tLensWarehousingDetailVO.setStoreName(store.getName());
+ }
}
}
pageInfo.setRecords(list);
diff --git a/manage/src/main/resources/mapping/TLensWarehousingDetailMapper.xml b/manage/src/main/resources/mapping/TLensWarehousingDetailMapper.xml
index 88c79fe..c1008ee 100644
--- a/manage/src/main/resources/mapping/TLensWarehousingDetailMapper.xml
+++ b/manage/src/main/resources/mapping/TLensWarehousingDetailMapper.xml
@@ -28,7 +28,7 @@
</sql>
<select id="pageLensList" resultType="com.jilongda.manage.vo.TLensWarehousingDetailVO">
select tlwd.id, tlwd.warehousingId, tlwd.brand, tlwd.supplier, tlwd.series, tlwd.total, tlwd.refractiveIndex, tlwd.ballMirror, tlwd.code, tlwd.createTime,tlwd.columnMirror,
- tlwd.updateTime, tlwd.createBy, tlwd.updateBy, tlwd.isDelete, tlwd.`type`
+ tlwd.updateTime, tlwd.createBy, tlwd.updateBy, tlwd.isDelete, tlwd.`type`,tw.storeId
from t_lens_warehousing_detail tlwd
left join t_warehousing tw on tlwd.warehousingId = tw.id
<where>
diff --git a/manage/src/main/resources/mapping/TOrderMapper.xml b/manage/src/main/resources/mapping/TOrderMapper.xml
index 0675f48..3c6903d 100644
--- a/manage/src/main/resources/mapping/TOrderMapper.xml
+++ b/manage/src/main/resources/mapping/TOrderMapper.xml
@@ -9,7 +9,6 @@
<result column="userId" property="userId" />
<result column="optometryId" property="optometryId" />
<result column="storeId" property="storeId" />
- <result column="modelId" property="modelId" />
<result column="color" property="color" />
<result column="series" property="series" />
<result column="rLens" property="rLens" />
@@ -46,7 +45,7 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, code, userId, optometryId, storeId, modelId, color, series, rLens, lLens, `type`, refractiveIndex, createTime, updateTime, createBy,
+ id, code, userId, optometryId, storeId, color, series, rLens, lLens, `type`, refractiveIndex, createTime, updateTime, createBy,
updateBy, isDelete, sysId, couponId, itemsId, remark, isMail, mailName, mailPhone, mailAddress, orderMoney, couponMoney, payMoney,
isMachining, machiningCode, isAccounting, accountingName, accountingTime,phone, realName, age, gender,payTypeName
</sql>
--
Gitblit v1.7.1