From 235b634e21abf8532221a56e99c4f08b481d4275 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Fri, 24 Feb 2023 16:21:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E6=A8=A1=E5=9D=97=E4=BB=A5=E5=8F=8A=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/shopping/pages/clothDetail.vue  | 62 ++++++++++++++-----
 .../org/jeecg/config/shiro/ShiroConfig.java   |  1 +
 .../zygoods/controller/ZyGoodsController.java | 56 +++++++++++++++--
 .../jeecg/modules/demo/zygoods/entity/Mk.java | 43 +++++++++++++
 4 files changed, 140 insertions(+), 22 deletions(-)
 create mode 100644 jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zygoods/entity/Mk.java

diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/clothDetail.vue b/ant-design-vue-jeecg/src/views/shopping/pages/clothDetail.vue
index 1e5ad349..e52de488 100644
--- a/ant-design-vue-jeecg/src/views/shopping/pages/clothDetail.vue
+++ b/ant-design-vue-jeecg/src/views/shopping/pages/clothDetail.vue
@@ -52,14 +52,14 @@
         <div class="line"></div>
         <div class="color f_14">颜色:{{color}} </div>
         <a-radio-group v-model="radioValue" @change="onChange">
-          <a-radio :value="'black'">
-            黑
+          <a-radio :value="'白色'">
+            白色
           </a-radio>
-          <a-radio :value="'gray'">
-            灰
+          <a-radio :value="'黑色'">
+            黑色
           </a-radio>
-          <a-radio :value="'orange'">
-            橙
+          <a-radio :value="'灰色'">
+            灰色
           </a-radio>
         </a-radio-group>
         <div class="size f_14">尺码:<a @click="dialogVisible1 = true">尺码参照表</a> | <i class="iconfont icon-ic_jia"></i> <span class="c_333 f_14">找到您的尺寸</span></div>
@@ -126,19 +126,19 @@
         <tr>
           <td class="textfield">商品名称：{{clothDetail.name}}</td>
           <td>商品编号：{{clothDetail.num}}</td>
-          <td>风格：{{clothDetail.style}}</td>
-          <td>商品毛重：{{clothDetail.weight}}</td>
+          <td>规格：{{clothDetail.style}}</td>
+          <td>产品概述：{{clothDetail.weight}}</td>
         </tr>
         <tr>
-          <td>货号：{{clothDetail.itemNo}}</td>
-          <td>领型：{{clothDetail.collar}}</td>
-          <td>材质：{{clothDetail.material}}</td>
+          <td>结构：{{clothDetail.itemNo}}</td>
+          <td>特征：{{clothDetail.collar}}</td>
+          <td>折叠搭配及包装：{{clothDetail.material}}</td>
           <td>适用场景：{{clothDetail.scene}}</td>
         </tr>
         <tr>
-          <td>版型：{{clothDetail.type}}</td>
-          <td>衣门襟：{{clothDetail.placket}}</td>
-          <td>开衩设计：{{clothDetail.slit}}</td>
+          <td>配件及标志：{{clothDetail.type}}</td>
+          <td>缝纫形式：{{clothDetail.placket}}</td>
+          <td>产地：{{clothDetail.slit}}</td>
           <td>适用人群：{{clothDetail.people}}</td>
         </tr>
       </table>
@@ -149,11 +149,15 @@
 <script>
   import Header from "../components/Header/HeaderView";
   import Footer from "../components/Footer/FooterView"
+  import { httpAction, getAction } from '@/api/manage'
   export default {
     name: "clothDetail",
     components: { Header,Footer },
     data() {
       return {
+        url: {
+          lxlistxq: "/zygoods/zyGoods/lxlistxq",
+        },
         dialogVisible1: false,//控制 尺码参照表 弹窗开关
         dialogVisible2: false,//控制 更多详情 弹窗开关
         dialogVisible3: false,//控制 详细说明 弹窗开关
@@ -164,8 +168,8 @@
         price:13200.00,//价格
         favour:'满1100减300',//优惠
         sell:'每满300元，可减40元现金，最多可减40000元 | 距结束还剩每满300元，可减40元现金，最多可减40000元 | 距结束还剩 ',//促销
-        color:'黑色',//颜色
-        radioValue: 'black',//选中的颜色
+        color:'白色',//颜色
+        radioValue: '白色',//选中的颜色
         sizeList:[
           {
             id:1,
@@ -260,6 +264,7 @@
       },
       onChange(e) {
         console.log('radio checked', e.target.value);
+        this.color = e.target.value;
       },
       sizeChange(value){
         this.size = value
@@ -293,6 +298,31 @@
       }
     },
     mounted() {
+      getAction(this.url.lxlistxq,{id:this.$route.query.id}).then((res1) => {
+        if (res1.success) {
+          //console.log(res1.result)
+          this.selectedClothList = res1.result.selectedClothList;
+          this.baseUrl = res1.result.baseUrl;
+          this.title = res1.result.zyGoods.goodsName;
+          this.popularity = res1.result.zyGoods.click;
+          this.sales = res1.result.zyGoods.num;
+          this.price = res1.result.zyGoods.unitPrice;
+          this.clothDetail.name = res1.result.zyGoods.goodsName;
+          this.clothDetail.num = res1.result.zyGoods.goodsCode;
+          this.clothDetail.style = res1.result.zyGoods.specification;
+          this.clothDetail.weight = res1.result.zyGoods.productOverview;
+          this.clothDetail.itemNo = res1.result.zyGoods.structure;
+          this.clothDetail.collar = res1.result.zyGoods.characteristic;
+          this.clothDetail.material = res1.result.zyGoods.foldingPackaging;
+          //this.clothDetail.scene = res1.result.zyGoods.goodsName;
+          this.clothDetail.type = res1.result.zyGoods.accLogos;
+          this.clothDetail.placket = res1.result.zyGoods.sewingForm;
+          this.clothDetail.slit = res1.result.zyGoods.placeOrigin;
+          //this.clothDetail.people = res1.result.zyGoods.goodsName;
+        }else{
+          this.$message.error(res1.message);
+        }
+      });
       // let sell = document.getElementById('sell')
       // let title = document.getElementById('title')
       // console.log('sell')
diff --git a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
index 9164bab4..a6331fd3 100644
--- a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
+++ b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
@@ -162,6 +162,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/zygoods/zyGoods/fzlx","anon");
         filterChainDefinitionMap.put("/zygoods/zyGoods/cd","anon");
         filterChainDefinitionMap.put("/zygoods/zyGoods/lxlist","anon");
+        filterChainDefinitionMap.put("/zygoods/zyGoods/lxlistxq","anon");
 
         //filterChainDefinitionMap.put("/actTask/**", "anon");
         //filterChainDefinitionMap.put("/actProcessIns/**", "anon");
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zygoods/controller/ZyGoodsController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zygoods/controller/ZyGoodsController.java
index 21ebb64f..ecf7a730 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zygoods/controller/ZyGoodsController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zygoods/controller/ZyGoodsController.java
@@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.demo.base.entity.ZyClothsModular;
 import org.jeecg.modules.demo.base.entity.ZyClothsType;
 import org.jeecg.modules.demo.base.service.IZyClothsModularService;
 import org.jeecg.modules.demo.base.service.IZyClothsTypeService;
@@ -451,7 +452,7 @@ public class ZyGoodsController extends JeecgController<ZyGoods, IZyGoodsService>
 		 for(int i = 0 ; i < pageList.getRecords().size();i++){
 			 Zxdz zxdz = new Zxdz();
 			 zxdz.setId(pageList.getRecords().get(i).getId());
-			 zxdz.setImgUrl("http://localhost:10085/jeecg-boot/sys/common/static/"+pageList.getRecords().get(i).getGoodsPicture());
+			 zxdz.setImgUrl("http://localhost:10085/jeecg-boot/sys/common/static/"+pageList.getRecords().get(i).getDefaultPicture());
 			 zxdz.setPrice(pageList.getRecords().get(i).getUnitPrice());
 			 zxdz.setTitle1(zyClothsTypeService.getById(pageList.getRecords().get(i).getClothsTypeId()).getTypeName());
 			 zxdz.setTitle2(pageList.getRecords().get(i).getGoodsName());
@@ -484,7 +485,7 @@ public class ZyGoodsController extends JeecgController<ZyGoods, IZyGoodsService>
 		 for(int i = 0 ; i < pageList.getRecords().size();i++){
 			 Tcsp tcsp = new Tcsp();
 			 tcsp.setId(pageList.getRecords().get(i).getId());
-			 tcsp.setImgUrl("http://localhost:10085/jeecg-boot/sys/common/static/"+pageList.getRecords().get(i).getGoodsPicture());
+			 tcsp.setImgUrl("http://localhost:10085/jeecg-boot/sys/common/static/"+pageList.getRecords().get(i).getDefaultPicture());
 			 tcsp.setTime(pageList.getRecords().get(i).getUnitPrice());
 			 tcsp.setTitle(pageList.getRecords().get(i).getGoodsName());
 			 tcspList.add(tcsp);
@@ -526,7 +527,7 @@ public class ZyGoodsController extends JeecgController<ZyGoods, IZyGoodsService>
 		 for(int j = 0 ; j < pageList.getRecords().size();j++){
 			 Fzlx fzlx = new Fzlx();
 			 fzlx.setId(pageList.getRecords().get(j).getId());
-			 fzlx.setImgUrl("http://localhost:10085/jeecg-boot/sys/common/static/"+pageList.getRecords().get(j).getGoodsPicture());
+			 fzlx.setImgUrl("http://localhost:10085/jeecg-boot/sys/common/static/"+pageList.getRecords().get(j).getDefaultPicture());
 			 fzlx.setTitle1(zyClothsTypeService.getById(pageList.getRecords().get(j).getClothsTypeId()).getTypeName());
 			 fzlx.setTitle2(pageList.getRecords().get(j).getGoodsName());
 			 String tag1 = zyClothsStyleService.getById(pageList.getRecords().get(j).getStyleId()).getCharacteristic();
@@ -567,7 +568,7 @@ public class ZyGoodsController extends JeecgController<ZyGoods, IZyGoodsService>
 		 for(int l = 0 ; l < pageListn.getRecords().size();l++){
 			 Fzlx fzlx = new Fzlx();
 			 fzlx.setId(pageListn.getRecords().get(l).getId());
-			 fzlx.setImgUrl("http://localhost:10085/jeecg-boot/sys/common/static/"+pageListn.getRecords().get(l).getGoodsPicture());
+			 fzlx.setImgUrl("http://localhost:10085/jeecg-boot/sys/common/static/"+pageListn.getRecords().get(l).getDefaultPicture());
 			 fzlx.setTitle1(zyClothsTypeService.getById(pageListn.getRecords().get(l).getClothsTypeId()).getTypeName());
 			 fzlx.setTitle2(pageListn.getRecords().get(l).getGoodsName());
 			 String tag1 = zyClothsStyleService.getById(pageListn.getRecords().get(l).getStyleId()).getCharacteristic();
@@ -608,7 +609,7 @@ public class ZyGoodsController extends JeecgController<ZyGoods, IZyGoodsService>
 		 for(int n = 0 ; n < pageListt.getRecords().size();n++){
 			 Fzlx fzlx = new Fzlx();
 			 fzlx.setId(pageListt.getRecords().get(n).getId());
-			 fzlx.setImgUrl("http://localhost:10085/jeecg-boot/sys/common/static/"+pageListt.getRecords().get(n).getGoodsPicture());
+			 fzlx.setImgUrl("http://localhost:10085/jeecg-boot/sys/common/static/"+pageListt.getRecords().get(n).getDefaultPicture());
 			 fzlx.setTitle1(zyClothsTypeService.getById(pageListt.getRecords().get(n).getClothsTypeId()).getTypeName());
 			 fzlx.setTitle2(pageListt.getRecords().get(n).getGoodsName());
 			 String tag1 = zyClothsStyleService.getById(pageListt.getRecords().get(n).getStyleId()).getCharacteristic();
@@ -724,7 +725,7 @@ public class ZyGoodsController extends JeecgController<ZyGoods, IZyGoodsService>
 		 for (int i = 0 ; i < pageList.size() ; i++){
 			 FzlxSp fzlxSp = new FzlxSp();
 			 fzlxSp.setId(pageList.get(i).getId());
-			 fzlxSp.setImgUrl("http://localhost:10085/jeecg-boot/sys/common/static/"+pageList.get(i).getGoodsPicture());
+			 fzlxSp.setImgUrl("http://localhost:10085/jeecg-boot/sys/common/static/"+pageList.get(i).getDefaultPicture());
 			 fzlxSp.setCurrentPrice(pageList.get(i).getPromotionPrice());
 			 fzlxSp.setHistoricalPrice(pageList.get(i).getUnitPrice());
 			 fzlxSp.setTitle(pageList.get(i).getGoodsName());
@@ -733,5 +734,48 @@ public class ZyGoodsController extends JeecgController<ZyGoods, IZyGoodsService>
 		 }
 		 return Result.OK(listsp);
 	 }
+	 /**
+	  * 商城接口服装详情
+	  * @param req
+	  * @return
+	  */
+	 @AutoLog(value = "服装详情查询")
+	 @ApiOperation(value="服装详情查询", notes="服装详情查询")
+	 @GetMapping(value = "/lxlistxq")
+	 public Result<?> lxlistxq(HttpServletRequest req,@RequestParam(name="id",required=true) String id) {
+		 Map<String,Object> mapgoods = new HashMap<>();
+		 ZyGoods zyGoods = zyGoodsService.getById(id);
+		 mapgoods.put("zyGoods",zyGoods);
+		 String[] baseUrl = zyGoods.getGoodsPicture().split(",");
+		 String str = "";
+		 for (int i = 0 ; i < baseUrl.length;i++){
+			 str = str +"http://localhost:10085/jeecg-boot/sys/common/static/"+baseUrl[i]+",";
+		 }
+		 mapgoods.put("baseUrl",str.substring(0,str.length()-1).split(","));
+		 //模块数据
+		 ZyStyleModule zyStyleModule = new ZyStyleModule();
+		 QueryWrapper<ZyStyleModule> queryWrapper = QueryGenerator.initQueryWrapper(zyStyleModule, req.getParameterMap());
+		 queryWrapper.eq("style_id",zyGoods.getStyleId());
+		 queryWrapper.eq("type_id",zyGoods.getClothsTypeId());
+		 List<ZyStyleModule> listzsm = zyStyleModuleService.list(queryWrapper);
+		 String mkids = "";
+		 for (int k = 0 ; k < listzsm.size() ; k++){
+			 mkids = mkids + listzsm.get(k).getModularId()+",";
+		 }
+		 ZyClothsModular zyClothsModular = new ZyClothsModular();
+		 QueryWrapper<ZyClothsModular> queryWrapper2 = QueryGenerator.initQueryWrapper(zyClothsModular, req.getParameterMap());
+		 queryWrapper2.in("id",mkids.substring(0,mkids.length()-1).split(","));
+		 List<ZyClothsModular> listzcm = zyClothsModularService.list(queryWrapper2);
+		 List<Mk> listmk = new ArrayList<>();
+		 for (int j = 0 ; j < listzcm.size() ; j++){
+		 	 Mk mk = new Mk();
+			 mk.setId(listzcm.get(j).getId());
+			 mk.setText(listzcm.get(j).getModularName());
+			 mk.setUrl("http://localhost:10085/jeecg-boot/sys/common/static/"+listzcm.get(j).getPictureUrl());
+			 listmk.add(mk);
+		 }
+		 mapgoods.put("selectedClothList",listmk);
+		 return Result.OK(mapgoods);
+	 }
 
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zygoods/entity/Mk.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zygoods/entity/Mk.java
new file mode 100644
index 00000000..224ff946
--- /dev/null
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zygoods/entity/Mk.java
@@ -0,0 +1,43 @@
+package org.jeecg.modules.demo.zygoods.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 商品表
+ * @Author: jeecg-boot
+ * @Date:   2022-12-07
+ * @Version: V1.0
+ */
+@Data
+
+public class Mk implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**商品图片*/
+	@Excel(name = "图片", width = 15)
+	@ApiModelProperty(value = "图片")
+	private java.lang.String url;
+	/**商品名称*/
+	@Excel(name = "名称", width = 15)
+	@ApiModelProperty(value = "名称")
+	private java.lang.String text;
+}