From c153cd01974defe0d20ecbbb2c1f2fdc522d05f8 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期四, 21 九月 2023 18:34:34 +0800
Subject: [PATCH] 企业端
---
server/service/src/main/java/com/doumee/service/business/impl/BaseCategoryServiceImpl.java | 3
server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java | 9 ++
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 8 +-
server/company/src/main/resources/application.yml | 2
platform/src/utils/request.js | 1
server/service/src/main/java/com/doumee/service/business/impl/FileRecordServiceImpl.java | 13 ++++
/dev/null | 32 ----------
server/zhubo/src/main/resources/application.yml | 2
server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java | 7 +
server/service/src/main/java/com/doumee/dao/business/model/FileRecord.java | 4
server/zhubo/pom.xml | 2
server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java | 9 ++-
company_admin/.env.development | 3 -
server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java | 2
server/service/src/main/resources/mappers/BaseCategoryMapper.xml | 12 ++--
h5/manifest.json | 2
platform/.env.development | 4
platform/src/views/business/goods.vue | 3
server/platform/src/main/resources/application.yml | 2
platform/.env.staging | 1
20 files changed, 58 insertions(+), 63 deletions(-)
diff --git a/company_admin/.env.development b/company_admin/.env.development
index 02e8212..e53d86e 100644
--- a/company_admin/.env.development
+++ b/company_admin/.env.development
@@ -3,11 +3,8 @@
# VUE_APP_API = 'https://dmtest.ahapp.net/preselect_interface/'
-<<<<<<< HEAD
VUE_APP_API = 'http://192.168.0.35:10022/'
-=======
# VUE_APP_API = 'http://192.168.0.15:10024/'
->>>>>>> 3fbfdefe98e5d35e32d74138ce73a1b4e2fe5465
VUE_APP_API = 'https://dmtest.ahapp.net/preselect_web_interface/'
diff --git a/h5/manifest.json b/h5/manifest.json
index 86f50bd..f3a4ff9 100644
--- a/h5/manifest.json
+++ b/h5/manifest.json
@@ -87,7 +87,7 @@
// "target" : "https://dmtest.ahapp.net/",
"changeOrigin" : true,
"secure" : false,
- "pathRewrite" : {
+ "pathRewrite": {
"^/preselect_h5_interface" : "/"
}
}
diff --git a/h5/package-lock.json b/h5/package-lock.json
deleted file mode 100644
index 839857b..0000000
--- a/h5/package-lock.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-<<<<<<< HEAD
- "requires": true,
- "lockfileVersion": 1,
- "dependencies": {
- "throttle-debounce": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-2.3.0.tgz",
- "integrity": "sha512-H7oLPV0P7+jgvrk+6mwwwBDmxTaxnu9HMXmloNLXwnNO0ZxZ31Orah2n8lU1eMPvsaowP2CX+USCgyovXfdOFQ=="
- },
- "v-viewer": {
- "version": "1.6.4",
- "resolved": "https://registry.npmjs.org/v-viewer/-/v-viewer-1.6.4.tgz",
- "integrity": "sha512-LVkiUHpmsbsZXebeNXnu8krRCi5i2n07FeLFxoIVGhw8lVvTBO0ffpbDC6mLEuacCjrIh09HjIqpciwUtWE8lQ==",
- "requires": {
- "throttle-debounce": "^2.0.1",
- "viewerjs": "^1.5.0"
- }
- },
- "viewerjs": {
- "version": "1.11.6",
- "resolved": "https://registry.npmjs.org/viewerjs/-/viewerjs-1.11.6.tgz",
- "integrity": "sha512-TlhdSp2oEOLFXvEp4psKaeTjR5zBjTRcM/sHUN8PkV1UWuY8HKC8n7GaVdW5Xqnwdr/F1OmzLik1QwDjI4w/nw=="
- }
- }
-=======
- "name": "h5",
- "lockfileVersion": 3,
- "requires": true,
- "packages": {}
->>>>>>> 1ee5043af9ee5e53acb52a70fd93c4656e8bbb44
-}
diff --git a/platform/.env.development b/platform/.env.development
index c53b589..acb28c2 100644
--- a/platform/.env.development
+++ b/platform/.env.development
@@ -7,9 +7,9 @@
# 浠诲悍
# VUE_APP_API = 'http://192.168.0.15:10017/'
# 鐒︽澗
-VUE_APP_API = 'http://192.168.0.36:10023'
+#VUE_APP_API = 'http://192.168.0.36:10023'
# 姹熻悕
-# VUE_APP_API = 'http://192.168.0.35:10023'
+VUE_APP_API = 'http://192.168.0.35:10023'
# #娴嬭瘯鏈嶅姟鍣�
# VUE_APP_API = 'https://dmtest.ahapp.net/preselect_admin_interface'
diff --git a/platform/.env.staging b/platform/.env.staging
index 44d070b..81c73c4 100644
--- a/platform/.env.staging
+++ b/platform/.env.staging
@@ -7,3 +7,4 @@
# https://dmtest.ahapp.net/preselect_admin_interface/doc.html
VUE_APP_API = 'https://dmtest.ahapp.net/preselect_admin_interface'
+VUE_APP_API = 'http://127.0.0.1:10023'
diff --git a/platform/src/utils/request.js b/platform/src/utils/request.js
index 703ba15..8416b58 100644
--- a/platform/src/utils/request.js
+++ b/platform/src/utils/request.js
@@ -7,6 +7,7 @@
axios.defaults.headers.common['Content-Type'] = 'application/json;charset=UTF-8'
const axiosInstance = axios.create({
baseURL: process.env.VUE_APP_API_PREFIX,
+ // baseURL: process.env.VUE_APP_API,
// 璇锋眰瓒呮椂鏃堕棿
timeout: 60000
})
diff --git a/platform/src/views/business/goods.vue b/platform/src/views/business/goods.vue
index 98ebff2..fffe446 100644
--- a/platform/src/views/business/goods.vue
+++ b/platform/src/views/business/goods.vue
@@ -74,7 +74,8 @@
<el-table-column prop="brandName" label="鍝佺墝" min-width="100px"></el-table-column>
<el-table-column prop="categoryName" label="绫诲埆" min-width="100px"></el-table-column>
<el-table-column prop="zdPrice" label="鎸囧浠凤紙鍏冿級" min-width="100px"></el-table-column>
- <el-table-column prop="price" label="閲囪喘浠�(鍏�)" min-width="100px"></el-table-column>
+ <el-table-column prop="jdPrice" label="閲囪喘浠�(鍏�)" min-width="100px"></el-table-column>
+ <el-table-column prop="price" label="閿�鍞环(鍏�)" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
<el-table-column prop="status" v-if="containPermissions(['business:basegoods:update'])" label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
diff --git a/server/company/src/main/resources/application.yml b/server/company/src/main/resources/application.yml
index 6787c56..ac52ad2 100644
--- a/server/company/src/main/resources/application.yml
+++ b/server/company/src/main/resources/application.yml
@@ -11,7 +11,7 @@
# application:
# name: doumeemes
profiles:
- active: dev
+ active: pro
# JSON杩斿洖閰嶇疆
jackson:
diff --git a/server/platform/src/main/resources/application.yml b/server/platform/src/main/resources/application.yml
index bf924e8..91e823b 100644
--- a/server/platform/src/main/resources/application.yml
+++ b/server/platform/src/main/resources/application.yml
@@ -11,7 +11,7 @@
# application:
# name: doumeemes
profiles:
- active: dev
+ active: pro
# JSON杩斿洖閰嶇疆
jackson:
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java b/server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java
index adbe230..ab188eb 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/BaseGoods.java
@@ -90,8 +90,8 @@
@ExcelColumn(name="鎸囧浠凤紙鍏冿級")
private BigDecimal zdPrice;
- @ApiModelProperty(value = "鍏ユ墜浠锋牸锛堝厓锛�", example = "1")
- @ExcelColumn(name="鍏ユ墜浠锋牸锛堝厓锛�")
+ @ApiModelProperty(value = "閿�鍞环鏍硷紙鍏冿級", example = "1")
+ @ExcelColumn(name="閿�鍞环鏍硷紙鍏冿級")
private BigDecimal price;
@ApiModelProperty(value = "鏁版嵁鏉ユ簮 0鎵嬪姩褰曞叆 1鎵归噺瀵煎叆 2鏁版嵁婧愬悓姝�", example = "1")
@ExcelColumn(name="鏁版嵁鏉ユ簮 0鎵嬪姩褰曞叆 1鎵归噺瀵煎叆 2鏁版嵁婧愬悓姝�")
@@ -125,5 +125,8 @@
@TableField(exist = false)
private List<Integer> idList;
-
+ @ApiModelProperty(value = "閲囪喘浠凤紙鍏冿級", example = "1")
+ @ExcelColumn(name="閲囪喘浠凤紙鍏冿級")
+ @TableField(exist = false)
+ private BigDecimal jdPrice;
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/FileRecord.java b/server/service/src/main/java/com/doumee/dao/business/model/FileRecord.java
index 0621e34..b7c64b7 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/FileRecord.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/FileRecord.java
@@ -31,7 +31,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+// @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +40,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+// @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BaseCategoryServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BaseCategoryServiceImpl.java
index 56cf831..2068a13 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BaseCategoryServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BaseCategoryServiceImpl.java
@@ -327,8 +327,9 @@
queryWrapper.lambda().orderByAsc(BaseCategory::getSortnum);
IPage<BaseCategory> baseCategoryIPage = baseCategoryMapper.selectPage(page, queryWrapper);
+ String preUrl = getPreUrl();
if (!CollectionUtils.isEmpty(baseCategoryIPage.getRecords())){
- baseCategoryIPage.getRecords().forEach(s->s.setImgfullurl(getPreUrl()+s.getImgurl()));
+ baseCategoryIPage.getRecords().forEach(s->s.setImgfullurl(preUrl+s.getImgurl()));
}
return PageData.from(baseCategoryIPage);
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java
index 7c30b43..0c53211 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java
@@ -359,8 +359,11 @@
Utils.MP.blankToNull(pageWrap.getModel());
queryWrapper.leftJoin(Brand.class,Brand::getId,BaseGoods::getBrandId)
.leftJoin(BaseCategory.class,BaseCategory::getId,BaseGoods::getCategoryId)
+// .leftJoin(BaseData.class,BaseData::getId,BaseGoods::getBaseDataId)
.selectAll(BaseGoods.class)
+ .selectAs(BaseCategory::getPriceRate,BaseGoods::getCateRatePrice)
.selectAs(Brand::getName,BaseGoods::getBrandName)
+// .selectAs(BaseData::getPrice,BaseGoods::getJdPrice)
.selectAs(BaseCategory::getName,BaseGoods::getCategoryName)
.eq(BaseGoods::getIsdeleted, Constants.ZERO)
.like(StringUtils.isNotBlank(pageWrap.getModel().getName()), BaseGoods::getName,pageWrap.getModel().getName())
@@ -374,7 +377,11 @@
String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+ systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_IMG).getCode();
pageData.getRecords().forEach(i->{
- i.setFullImgUrl(prefixUrl + i.getImgurl());
+ if(StringUtils.isNotBlank(i.getImgurl())){
+ i.setFullImgUrl(prefixUrl + i.getImgurl());
+ }
+ i.setJdPrice(i.getPrice());
+ i.setPrice(Constants.formatBigdecimal(i.getPrice()).multiply(Constants.formatBigdecimal(i.getCateRatePrice())));
});
return pageData;
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index f1427f5..96c00c3 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -291,11 +291,11 @@
queryWrapper.selectAll(Company.class)
.selectAs(SystemUser::getUsername,Company::getManagerUserName);
queryWrapper.select(
- "(select su1.USERNAME from system_user su1 where su1.id = t.MANAGER_ID) as managerUserName," +
+ "(select su1.USERNAME from system_user su1 where su1.id = t.MANAGER_ID) as managerUserName," +
"(select su2.REALNAME from system_user su2 where su2.id = t.SALESMAN_ID) as salesmanRealName," +
- "(select count(su3.id) from system_user su3 where su3.COMPANY_ID = t.ID and su3.TYPE = 2) as anchorUserNum," +
- "(select count(su4.id) from system_user su4 where su4.COMPANY_ID = t.ID and su4.TYPE = 1) as empUserNum," +
- "(select count(g.id) from goods g where g.COMPANY_ID = t.ID )goodsNum");
+ "(select count(su3.id) from system_user su3 where su3.deleted=0 and su3.COMPANY_ID = t.ID and su3.TYPE = 2) as anchorUserNum," +
+ "(select count(su4.id) from system_user su4 where su4.deleted=0 and su4.COMPANY_ID = t.ID and su4.TYPE = 1) as empUserNum," +
+ "(select count(g.id) from goods g where g.isdeleted=0 and g.COMPANY_ID = t.ID )goodsNum");
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Company::getName,pageWrap.getModel().getName())
.like(StringUtils.isNotBlank(pageWrap.getModel().getManagerUserName()),SystemUser::getUsername,pageWrap.getModel().getManagerUserName())
.eq(Objects.nonNull(pageWrap.getModel().getStatus()),Company::getStatus,pageWrap.getModel().getStatus())
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/FileRecordServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/FileRecordServiceImpl.java
index 29f8cc1..4f8656e 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/FileRecordServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/FileRecordServiceImpl.java
@@ -21,6 +21,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -58,10 +59,21 @@
log.info("寮�濮嬩笂浼犻檮浠朵俊鎭�=================end========鏃犲緟澶勭悊鏁版嵁===========");
return 0;
}
+ List<String > keyList = new ArrayList<>();
+ for(FileRecord model:allLis){
+ keyList.add(model.getKeyval());
+ }
+ try {
+ ALiYunUtil obs = new ALiYunUtil(ossModel.getEndpoint(), ossModel.getAccessId(), ossModel.getAccessKey());
+ obs.deleteObjects(ossModel.getBucket(),keyList);
+ }catch (Exception e){
+ }
+
Date date = new Date();
for(FileRecord model:allLis){
try {
ALiYunUtil obs = new ALiYunUtil(ossModel.getEndpoint(), ossModel.getAccessId(), ossModel.getAccessKey());
+ obs.deleteObjects(ossModel.getBucket(),keyList);
obs.uploadOnlineObject(model.getUrl(),ossModel.getBucket(), model.getKeyval(),null);
model.setStatus(Constants.ONE);
model.setContent("涓婁紶鎴愬姛");
@@ -72,6 +84,7 @@
model.setEditDate(date);
fileRecordMapper.updateById(model);
}
+
return 0;
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
index adf97ea..23499bd 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
@@ -1093,7 +1093,9 @@
.apply(!Objects.isNull(pageWrap.getModel()) && !Objects.isNull(pageWrap.getModel().getEPrice()), " t.PRICE <= "+pageWrap.getModel().getEPrice()+" ");
queryWrapper.orderByDesc(Goods::getId);
IPage<Goods> goodsIPage = goodsJoinMapper.selectJoinPage(page, Goods.class, queryWrapper);
- this.dealGoodsMsg(goodsIPage.getRecords());
+ if(!Objects.isNull(goodsIPage.getRecords())&&goodsIPage.getRecords().size()>Constants.ZERO){
+ this.dealGoodsMsg(goodsIPage.getRecords());
+ }
return PageData.from(goodsIPage);
}
@@ -1103,8 +1105,9 @@
String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+ systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_IMG).getCode();
String prefixUrlCategory = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
- + systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_IMG).getCode();
+ + systemDictDataBiz.queryByCode(Constants.OSS, Constants.CATEGORY_IMG).getCode();
List<Integer> integerList = goodsList.stream().map(Goods::getId).collect(Collectors.toList());
+
List<Multifile> mFileList = multifileMapper.selectList(new QueryWrapper<Multifile>()
.in("OBJ_ID",integerList).eq("TYPE",Constants.ZERO));
List<GoodsParam> goodsParamList = goodsParamMapper.selectList(new QueryWrapper<GoodsParam>()
diff --git a/server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java b/server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
index 83c8fb6..1e0c554 100644
--- a/server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
@@ -135,7 +135,7 @@
// 鎵ц鏌ヨ
PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());
List<SystemUserListVO> userList = systemUserMapper.selectManageList(pageWrap.getModel(), pageWrap.getOrderByClause());
- String zhuboRoomUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.ZHUBO_ROOM_URL).getCode();
+ String zhuboRoomUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.ZHUBO_ROOM_URL).getCode();
for (SystemUserListVO user : userList) {
// 鏌ヨ鐢ㄦ埛瑙掕壊鍒楄〃
diff --git a/server/service/src/main/resources/mappers/BaseCategoryMapper.xml b/server/service/src/main/resources/mappers/BaseCategoryMapper.xml
index b222ab2..72a2b60 100644
--- a/server/service/src/main/resources/mappers/BaseCategoryMapper.xml
+++ b/server/service/src/main/resources/mappers/BaseCategoryMapper.xml
@@ -19,10 +19,10 @@
select * from base_category ${ew.customSqlSegment}
</select>
- <select id="selectList" resultMap="BaseCategory">
- select * from base_category ${ew.customSqlSegment}
- </select>
- <select id="selectPage" resultMap="BaseCategory">
- select * from base_category ${ew.customSqlSegment}
- </select>
+<!-- <select id="selectList" resultMap="BaseCategory">-->
+<!-- select * from base_category ${ew.customSqlSegment}-->
+<!-- </select>-->
+<!-- <select id="selectPage" resultMap="BaseCategory">-->
+<!-- select * from base_category ${ew.customSqlSegment}-->
+<!-- </select>-->
</mapper>
diff --git a/server/zhubo/pom.xml b/server/zhubo/pom.xml
index 7645a85..2cfd25e 100644
--- a/server/zhubo/pom.xml
+++ b/server/zhubo/pom.xml
@@ -26,7 +26,7 @@
</dependencies>
<build>
- <finalName>company</finalName>
+ <finalName>zhubo</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
diff --git a/server/zhubo/src/main/resources/application.yml b/server/zhubo/src/main/resources/application.yml
index cfb19a6..4fb560e 100644
--- a/server/zhubo/src/main/resources/application.yml
+++ b/server/zhubo/src/main/resources/application.yml
@@ -11,7 +11,7 @@
# application:
# name: doumeemes
profiles:
- active: dev
+ active: pro
# JSON杩斿洖閰嶇疆
jackson:
--
Gitblit v1.9.3