yu
/
CostumingPlatform
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into zhc4dev

Browse Source
zhc4dev
zhc077 2 years ago
parent ad8a9bf67c 4b5d77d3fe
commit 1c92b11b5d
15 changed files with 711 additions and 206 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 501
      ant-design-vue-jeecg/src/views/shopping/components/Order/placeOrder.vue
  2. 62
      ant-design-vue-jeecg/src/views/shopping/pages/clothDetail.vue
  3. 5
      ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue
  4. 87
      ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue
  5. 1
      jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
  6. 72
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zygoods/controller/ZyGoodsController.java
  7. 43
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zygoods/entity/Mk.java
  8. 28
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zygoods/entity/ZyGoods.java
  9. 51
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
  10. 9
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
  11. 21
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
  12. 8
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
  13. 13
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
  14. 15
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/Grzx1.java
  15. 1
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/Grzx2.java

501
ant-design-vue-jeecg/src/views/shopping/components/Order/placeOrder.vue
Unescape View File

@ -13,70 +13,149 @@
<span class="icon">1</span> <span class="icon">1</span>
<span class="text f_18">配送地址</span></div> <span class="text f_18">配送地址</span></div>
<div class="form"> <div class="form">
<a-form layout="vertical"> <!-- <a-form layout="vertical">-->
<a-form-item label="请选择您的配送方式"> <!-- <a-form-item label="请选择您的配送方式">-->
<a-radio-group> <!-- <a-radio-group>-->
<a-radio value="0"> <!-- <a-radio value="0">-->
送货上门 <!-- 送货上门-->
</a-radio> <!-- </a-radio>-->
<a-radio value="1"> <!-- <a-radio value="1">-->
门店自提 <!-- 门店自提-->
</a-radio> <!-- </a-radio>-->
</a-radio-group> <!-- </a-radio-group>-->
</a-form-item> <!-- </a-form-item>-->
<a-form-item <!-- <a-form-item-->
label="称呼" <!-- label="称呼"-->
v-if="addr.length == 0" <!-- v-if="addr.length == 0"-->
<!-- >-->
<!-- <a-select placeholder="请选择称呼" :value="userSex1" style="width: 120px;margin-right:10px" @change="handleChange1">-->
<!-- <a-select-option value="1">-->
<!-- 先生-->
<!-- </a-select-option>-->
<!-- <a-select-option value="0">-->
<!-- 女士-->
<!-- </a-select-option>-->
<!-- </a-select>-->
<!-- <a-input style="width:300px" placeholder="请输入姓名" :value="userName1" prop="userName"/>-->
<!-- </a-form-item>-->
<!-- <a-form-item-->
<!-- label="选择地址"-->
<!-- v-if="addr.length == 0"-->
<!-- >-->
<!-- <j-area-linkage type="cascader" v-model="addr1" placeholder="请选择省市区"/>-->
<!-- </a-form-item>-->
<!-- <a-form-item-->
<!-- label="详细地址"-->
<!-- v-if="addr.length == 0"-->
<!-- >-->
<!-- <a-textarea v-model="detailed1" placeholder="请输入街道、门牌号码等详细地址" auto-size />-->
<!-- </a-form-item>-->
<!-- <a-form-item-->
<!-- label="手机号码"-->
<!-- v-if="addr.length == 0"-->
<!-- >-->
<!-- <a-input style="width:150px;margin-right:10px" placeholder="+86 中国大陆地区" disabled/>-->
<!-- <a-input style="width:300px" placeholder="请输入手机号码" :value="phone1"/>-->
<!-- </a-form-item>-->
<!-- <a-form-item v-if="addr.length == 0">-->
<!-- <a-checkbox @change="onChange1" :checked="save1">-->
<!-- 保存该地址至地址簿-->
<!-- </a-checkbox>-->
<!-- </a-form-item>-->
<!-- <a-form-item v-if="addr.length != 0">-->
<!-- <p class="d-flex addrTitle">-->
<!-- <span class="f_14 c_1B">地址</span>-->
<!-- <span class="f_12 c_1B" @click="showModal"><a-icon type="plus" />添加新地址</span>-->
<!-- </p>-->
<!-- <div class="d-flex cardDiv">-->
<!-- <div style="width: 370px" v-for="(item,index) in addr" :key="index" @click="handleCard" class="cardItem">-->
<!-- <p class="d-flex f_12 c_1B" style="font-weight: 600;justify-content: space-between;"><span>{{item.name}}</span><span class="f_14" @click="showModal(item)">编辑</span></p>-->
<!-- <p class="f_12 c_31" style="font-weight: 300">+86 {{item.phone}}</p>-->
<!-- <p class="f_12 c_31">{{item.province}}{{item.city}}{{item.area}}{{item.detailed}}</p>-->
<!-- <p class="f_12 c_1B" v-if="item.flag">默认地址</p>-->
<!-- </div>-->
<!-- </div>-->
<!-- </a-form-item>-->
<!-- </a-form>-->
<template>
<a-form-model
ref="ruleForm1"
:model="form1"
:rules="rules"
> >
<a-select placeholder="请选择称呼" :value="userSex1" style="width: 120px;margin-right:10px" @change="handleChange1"> <a-form-model-item label="请选择您的配送方式" prop="visit">
<a-select-option value="1"> <a-radio-group v-model="form1.visit">
先生 <a-radio value="0">
</a-select-option> 送货上门
<a-select-option value="0"> </a-radio>
女士 <a-radio value="1">
</a-select-option> 门店自提
</a-select> </a-radio>
<a-input style="width:300px" placeholder="请输入姓名" :value="userName"/> </a-radio-group>
</a-form-item> </a-form-model-item>
<a-form-item <a-form-model-item label="称呼" v-if="addr.length == 0">
label="选择地址" <a-select v-model="form1.sex" placeholder="请选择称呼" style="width:120px">
v-if="addr.length == 0" <a-select-option value="1">
> 先生
<j-area-linkage type="cascader" v-model="addr1" placeholder="请选择省市区"/> </a-select-option>
</a-form-item> <a-select-option value="2">
<a-form-item 女士
label="详细地址" </a-select-option>
v-if="addr.length == 0" </a-select>
> </a-form-model-item>
<a-textarea v-model="detailed1" placeholder="请输入街道、门牌号码等详细地址" auto-size /> <a-form-model-item
</a-form-item> label="姓名"
<a-form-item prop="name"
label="手机号码" v-if="addr.length == 0"
v-if="addr.length == 0" >
> <a-input placeholder="请输入姓名" v-model="form1.name" />
<a-input style="width:150px;margin-right:10px" placeholder="+86 中国大陆地区" disabled/> </a-form-model-item>
<a-input style="width:300px" placeholder="请输入手机号码" :value="phone1"/> <a-form-model-item
</a-form-item> label="选择地址"
<a-form-item v-if="addr.length == 0"> prop="addr"
<a-checkbox @change="onChange1"> v-if="addr.length == 0"
保存该地址至地址簿 >
</a-checkbox> <j-area-linkage type="cascader" v-model="form1.addr" placeholder="请选择省市区"/>
</a-form-item> </a-form-model-item>
<a-form-item v-if="addr.length != 0"> <a-form-model-item label="详细地址" prop="addr" v-if="addr.length == 0">
<p class="d-flex addrTitle"> <a-input v-model="form1.detailed" type="textarea" />
<span class="f_14 c_1B">地址</span> </a-form-model-item>
<span class="f_12 c_1B" @click="showModal"><a-icon type="plus" />添加新地址</span> <a-form-model-item
</p> label="手机号码"
<div class="d-flex cardDiv"> prop="phone"
<div style="width: 370px" v-for="(item,index) in addr" :key="index" @click="handleCard" class="cardItem"> v-if="addr.length == 0"
<p class="d-flex f_12 c_1B" style="font-weight: 600;justify-content: space-between;"><span>{{item.name}}</span><span class="f_14" @click="showModal">编辑</span></p> >
<p class="f_12 c_31" style="font-weight: 300">+86 {{item.phone}}</p> <a-input style="width:400px" placeholder="请输入手机号码" v-model="form1.phone">
<p class="f_12 c_31">{{item.province}}{{item.city}}{{item.area}}{{item.detailed}}</p> <template slot="addonBefore">
<p class="f_12 c_1B" v-if="item.flag">默认地址</p> <span>+86 中国大陆地区</span>
</template>
</a-input>
</a-form-model-item>
<a-form-model-item v-if="addr.length == 0">
<a-checkbox @change="onChange1" v-model="form1.save">
保存该地址至地址簿
</a-checkbox>
</a-form-model-item>
<a-form-model-item v-if="addr.length != 0">
<p class="d-flex addrTitle">
<span class="f_14 c_1B">地址</span>
<span class="f_12 c_1B" @click="showModal"><a-icon type="plus" />添加新地址</span>
</p>
<div class="d-flex cardDiv">
<div style="width: 370px" v-for="(item,index) in addr" :key="index" @click="handleCard" class="cardItem">
<p class="d-flex f_12 c_1B" style="font-weight: 600;justify-content: space-between;">
<span>{{item.name}}</span>
<span class="f_14" @click="handleEdit(item)">编辑</span>
</p>
<p class="f_12 c_31" style="font-weight: 300">+86 {{item.phone}}</p>
<p class="f_12 c_31" style="font-weight: 300"><j-area-linkage type="cascader" :value="item.addr" disabled/></p>
<p class="f_12 c_31">{{item.detailed}}</p>
<p class="f_12 c_1B" v-if="item.flag">默认地址</p>
</div>
</div> </div>
</div> </a-form-model-item>
</a-form-item> </a-form-model>
</a-form> </template>
</div> </div>
</div> </div>
<div class="addr"> <div class="addr">
@ -142,7 +221,7 @@
<span class="f_20 c_31">￥35,500</span> <span class="f_20 c_31">￥35,500</span>
</p> </p>
<div class="btnDiv"> <div class="btnDiv">
<div type="primary" class="dialogButton primary f_14">立即购买</div> <div type="primary" class="dialogButton primary f_14" @click="toBuy">立即购买</div>
</div> </div>
<p class="explain f_12 c_999">说明</p> <p class="explain f_12 c_999">说明</p>
<p class="f_12 c_999">在线支付订单提交之后15分钟内未付款，订单将被系统自动取消，请您尽快完成支付以确保商品能及时送达，避免取消订单带来不必要的麻烦。</p> <p class="f_12 c_999">在线支付订单提交之后15分钟内未付款，订单将被系统自动取消，请您尽快完成支付以确保商品能及时送达，避免取消订单带来不必要的麻烦。</p>
@ -160,46 +239,62 @@
<a-modal <a-modal
title="添加新地址" title="添加新地址"
:visible="visible" :visible="visible"
:confirm-loading="confirmLoading"
@ok="handleOk" @ok="handleOk"
@cancel="handleCancel" @cancel="handleCancel"
> >
<a-form layout="vertical"> <template>
<a-form-item <a-form-model
label="称呼" ref="ruleForm"
> :model="form"
<a-select placeholder="请选择称呼" :value="userSex2" style="width: 120px;margin-right:10px" @change="handleChange2"> :rules="rules"
<a-select-option value="1">
先生
</a-select-option>
<a-select-option value="0">
女士
</a-select-option>
</a-select>
<a-input style="width:300px" placeholder="请输入姓名" :value="userName"/>
</a-form-item>
<a-form-item
label="选择地址"
> >
<j-area-linkage type="cascader" v-model="addr2" placeholder="请选择省市区"/> <a-form-model-item label="称呼" >
</a-form-item> <a-select v-model="form.sex" placeholder="请选择称呼" style="width:120px">
<a-form-item <a-select-option value="1">
label="详细地址" 先生
> </a-select-option>
<a-textarea v-model="detailed2" placeholder="请输入街道、门牌号码等详细地址" auto-size /> <a-select-option value="2">
</a-form-item> 女士
<a-form-item </a-select-option>
label="手机号码" </a-select>
> </a-form-model-item>
<a-input style="width:150px;margin-right:10px" placeholder="+86 中国大陆地区" disabled/> <a-form-model-item
<a-input style="width:300px" placeholder="请输入手机号码" :value="phone2"/> label="姓名"
</a-form-item> prop="name"
<a-form-item> >
<a-checkbox @change="onChange4"> <a-input placeholder="请输入姓名" v-model="form.name" />
保存该地址至地址簿 </a-form-model-item>
</a-checkbox> <a-form-model-item
</a-form-item> label="选择地址"
</a-form> prop="addr"
>
<j-area-linkage type="cascader" v-model="form.addr" placeholder="请选择省市区"/>
</a-form-model-item>
<a-form-model-item label="详细地址" prop="detailed">
<a-input v-model="form.detailed" type="textarea" />
</a-form-model-item>
<a-form-model-item
label="手机号码"
prop="phone"
>
<a-input style="width:400px" placeholder="请输入手机号码" v-model="form.phone">
<template slot="addonBefore">
<span>+86 中国大陆地区</span>
</template>
</a-input>
</a-form-model-item>
<a-form-model-item>
<a-checkbox @change="onChange4" v-model="form.save">
保存该地址至地址簿
</a-checkbox>
</a-form-model-item>
<a-form-model-item>
<a-checkbox @change="onChange5" v-model="form.flag">
设置为默认地址
</a-checkbox>
</a-form-model-item>
</a-form-model>
</template>
</a-modal> </a-modal>
</div> </div>
</template> </template>
@ -207,62 +302,89 @@
export default { export default {
data() { data() {
return { return {
ModalText: 'Content of the modal',
visible: false, visible: false,
confirmLoading: false,
formLayout: 'horizontal', formLayout: 'horizontal',
delivery:'17719145652',//配送方式 delivery:'17719145652',//配送方式
visit:'0',//是否送货上门 visit:'0',//是否送货上门
phone:'17719145652',//电话 phone:'17719145652',//电话
userSex1:'',//性别1
userSex2:'',//性别2
userName:'',//姓名
phone1:'',//电话1
phone2:'',//电话2
addr:[ addr:[
// { {
// id:1, id:1,
// name:'吴一', name:'吴一',
// phone:'17777777777', sex:'1',
// province:'河南省', phone:'17777777777',
// city:'驻马店市', addr:'210521',
// area:'驿城区', detailed:'黄淮学院北区',
// detailed:'黄淮学院北区', flag:true,//是否是默认地址
// flag:true,//是否是默认地址 },//地址一
// },//地址一 {
// { id:2,
// id:2, name:'吴二',
// name:'吴二', sex:'2',
// phone:'17777777777', phone:'17777777777',
// province:'河南省', addr:'210521',
// city:'驻马店市', detailed:'黄淮学院北区',
// area:'驿城区', flag:false,//是否是默认地址
// detailed:'黄淮学院北区', },//地址二
// flag:false,//是否是默认地址 {
// },//地址二 id:3,
// { name:'吴三',
// id:3, sex:'1',
// name:'吴三', phone:'17777777777',
// phone:'17777777777', addr:'210521',
// province:'河南省', detailed:'黄淮学院北区',
// city:'驻马店市', flag:false,//是否是默认地址
// area:'驿城区', },//地址三
// detailed:'黄淮学院北区',
// flag:false,//是否是默认地址
// },//地址三
],//地址列表 ],//地址列表
addr1:'',//地址选择器1
addr2:'',//地址选择器2
detailed1:'',//详细地址1
detailed2:'',//详细地址2
save1:false,//是否保存到地址簿1
save2:false,//是否保存到地址簿2
value: 1, value: 1,
paymentMode:'',//支付方式 paymentMode:'',//支付方式
bill:'',//是否需要电子发票 bill:'',//是否需要电子发票
chinaArea:[],
num:1,//已选几件商品 num:1,//已选几件商品
}; form2:{
userSex2:'',//性别2(弹窗)
userName2:'',//姓名2(弹窗)
phone2:'',//电话2(弹窗)
addr2:'',//地址选择器2(弹窗)
detailed2:'',//详细地址2(弹窗)
save2:true,//是否保存到地址簿2(弹窗)
},
//弹窗数据
form: {
id:'',
sex: undefined,
name: '',
addr: '',
detailed: '',
phone: '',
save: true,
flag:false//是否默认地址
},
//外部添加地址数据
form1: {
visit:'',
sex: undefined,
name: '',
addr: '',
detailed: '',
phone: '',
save: true,
flag:false
},
rules: {
name: [
{ required: true, message: '请输入姓名', trigger: 'blur' },
],
visit: [
{ required: true, message: '请选择您的配送方式', trigger: 'change' },
],
addr: [{ required: true, message: '请选择地址', trigger: 'blur' }],
detailed: [{ required: true, message: '请输入详细地址', trigger: 'blur' }],
phone: [{ required: true, message: '请输入手机号码', trigger: 'blur' },
],
},
addrList:[
]
}
}, },
computed: { computed: {
formItemLayout() { formItemLayout() {
@ -303,7 +425,7 @@
}, },
onChange1(e) { onChange1(e) {
console.log(`checked = ${e.target.checked}`); console.log(`checked = ${e.target.checked}`);
this.save1 = !this.save1 this.form1.save = !this.form1.save
}, },
onChange2(e) { onChange2(e) {
console.log('radio checked', e.target.value); console.log('radio checked', e.target.value);
@ -314,28 +436,90 @@
this.bill = e.target.checked this.bill = e.target.checked
}, },
onChange4(e) { onChange4(e) {
console.log('radio checked', e.target.value); console.log(`checked = ${e.target.checked}`);
this.save2 = !this.save2 this.form.save = !this.form.save
}, },
onChange5(e) {
console.log(`checked = ${e.target.checked}`);
},
// 新增
showModal() { showModal() {
this.visible = true; this.visible = true;
}, },
// 编辑
handleEdit(item){
this.visible = true;
console.log(item)
// this.form.id = ''
this.form.sex = item.sex
this.form.name = item.name
this.form.addr = item.addr
this.form.phone = item.phone
this.form.detailed = item.detailed
this.form.flag = item.flag
},
handleOk(e) { handleOk(e) {
this.ModalText = 'The modal will be closed after two seconds'; //判断是添加地址还是修改地址
this.confirmLoading = true; let that = this
setTimeout(() => { let newFlag = this.addr.some(function(item){
this.visible = false; return item.id == that.form.id
this.confirmLoading = false; })
}, 2000); this.$refs.ruleForm.validate(valid => {
if (valid) {
if(newFlag){//是修改
// this.addr.
}else{//是新增
this.addr.push(this.form)
console.log('this.addr')
console.log(this.addr)
}
this.visible = false;
} else {
}
});
}, },
handleCancel(e) { handleCancel(e) {
console.log('Clicked cancel button');
this.visible = false; this.visible = false;
this.$refs.ruleForm.resetFields();
this.form.name = ''
this.form.sex = ''
this.form.name = ''
this.form.addr = ''
this.form.phone = ''
this.form.detailed = ''
this.form.flag = false
}, },
toBuy(){
this.$refs.ruleForm1.validate(valid => {
if (valid) {
this.addrList.push(this.form1)
console.log(this.addrList)
} else {
}
});
}
}, },
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.ant-form /deep/ .ant-form-item{
margin-bottom: 12px;
}
.cardDiv .j-area-linkage /deep/ .area-select{
background-color: #fff;
border: none;
span{
padding-left: 0;
font-size: 12px;
color:#313131;
cursor:auto;
font-weight: 500;
}
i{
display: none;
}
}
.btnDiv{ .btnDiv{
border-bottom: 1px solid #E7E7E7; border-bottom: 1px solid #E7E7E7;
padding-bottom: 30px; padding-bottom: 30px;
@ -421,6 +605,9 @@
.f_12{ .f_12{
border: 1px solid #C8C6C5; border: 1px solid #C8C6C5;
padding: 3px 8px; padding: 3px 8px;
height: 26px;
box-sizing: border-box;
line-height: 18px;
} }
i{ i{
margin-right: 3px; margin-right: 3px;
@ -430,7 +617,11 @@
.cardDiv{ .cardDiv{
justify-content: space-between; justify-content: space-between;
flex-wrap: wrap; flex-wrap: wrap;
.f_12{
height: 26px;
box-sizing: border-box;
line-height: 18px;
}
.cardItem{ .cardItem{
padding: 15px 16px; padding: 15px 16px;
margin-bottom: 20px; margin-bottom: 20px;

62
ant-design-vue-jeecg/src/views/shopping/pages/clothDetail.vue
Unescape View File

@ -52,14 +52,14 @@
<div class="line"></div> <div class="line"></div>
<div class="color f_14">颜色:{{color}} </div> <div class="color f_14">颜色:{{color}} </div>
<a-radio-group v-model="radioValue" @change="onChange"> <a-radio-group v-model="radioValue" @change="onChange">
<a-radio :value="'black'"> <a-radio :value="'白色'">
黑 白色
</a-radio> </a-radio>
<a-radio :value="'gray'"> <a-radio :value="'黑色'">
灰 黑色
</a-radio> </a-radio>
<a-radio :value="'orange'"> <a-radio :value="'灰色'">
橙 灰色
</a-radio> </a-radio>
</a-radio-group> </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> <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> <tr>
<td class="textfield">商品名称：{{clothDetail.name}}</td> <td class="textfield">商品名称：{{clothDetail.name}}</td>
<td>商品编号：{{clothDetail.num}}</td> <td>商品编号：{{clothDetail.num}}</td>
<td>风格：{{clothDetail.style}}</td> <td>规格：{{clothDetail.style}}</td>
<td>商品毛重：{{clothDetail.weight}}</td> <td>产品概述：{{clothDetail.weight}}</td>
</tr> </tr>
<tr> <tr>
<td>货号：{{clothDetail.itemNo}}</td> <td>结构：{{clothDetail.itemNo}}</td>
<td>领型：{{clothDetail.collar}}</td> <td>特征：{{clothDetail.collar}}</td>
<td>材质：{{clothDetail.material}}</td> <td>折叠搭配及包装：{{clothDetail.material}}</td>
<td>适用场景：{{clothDetail.scene}}</td> <td>适用场景：{{clothDetail.scene}}</td>
</tr> </tr>
<tr> <tr>
<td>版型：{{clothDetail.type}}</td> <td>配件及标志：{{clothDetail.type}}</td>
<td>衣门襟：{{clothDetail.placket}}</td> <td>缝纫形式：{{clothDetail.placket}}</td>
<td>开衩设计：{{clothDetail.slit}}</td> <td>产地：{{clothDetail.slit}}</td>
<td>适用人群：{{clothDetail.people}}</td> <td>适用人群：{{clothDetail.people}}</td>
</tr> </tr>
</table> </table>
@ -149,11 +149,15 @@
<script> <script>
import Header from "../components/Header/HeaderView"; import Header from "../components/Header/HeaderView";
import Footer from "../components/Footer/FooterView" import Footer from "../components/Footer/FooterView"
import { httpAction, getAction } from '@/api/manage'
export default { export default {
name: "clothDetail", name: "clothDetail",
components: { Header,Footer }, components: { Header,Footer },
data() { data() {
return { return {
url: {
lxlistxq: "/zygoods/zyGoods/lxlistxq",
},
dialogVisible1: false,//控制 尺码参照表 弹窗开关 dialogVisible1: false,//控制 尺码参照表 弹窗开关
dialogVisible2: false,//控制 更多详情 弹窗开关 dialogVisible2: false,//控制 更多详情 弹窗开关
dialogVisible3: false,//控制 详细说明 弹窗开关 dialogVisible3: false,//控制 详细说明 弹窗开关
@ -164,8 +168,8 @@
price:13200.00,//价格 price:13200.00,//价格
favour:'满1100减300',//优惠 favour:'满1100减300',//优惠
sell:'每满300元，可减40元现金，最多可减40000元 | 距结束还剩每满300元，可减40元现金，最多可减40000元 | 距结束还剩 ',//促销 sell:'每满300元，可减40元现金，最多可减40000元 | 距结束还剩每满300元，可减40元现金，最多可减40000元 | 距结束还剩 ',//促销
color:'黑色',//颜色 color:'白色',//颜色
radioValue: 'black',//选中的颜色 radioValue: '白色',//选中的颜色
sizeList:[ sizeList:[
{ {
id:1, id:1,
@ -260,6 +264,7 @@
}, },
onChange(e) { onChange(e) {
console.log('radio checked', e.target.value); console.log('radio checked', e.target.value);
this.color = e.target.value;
}, },
sizeChange(value){ sizeChange(value){
this.size = value this.size = value
@ -293,6 +298,31 @@
} }
}, },
mounted() { 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 sell = document.getElementById('sell')
// let title = document.getElementById('title') // let title = document.getElementById('title')
// console.log('sell') // console.log('sell')

5
ant-design-vue-jeecg/src/views/shopping/pages/gerenzhongxin.vue
Unescape View File

@ -179,13 +179,8 @@
getAction(this.url.findgoods).then((res) => { getAction(this.url.findgoods).then((res) => {
if(res.success) { if(res.success) {
this.allOrders2 = res.result; this.allOrders2 = res.result;
console.log("===========")
console.log(res.result)
console.log(this.allOrders2)
console.log("===========")
this.visible = true; this.visible = true;
} else { } else {
console.log("-----------")
} }
}); });
}, },

87
ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue
Unescape View File

@ -52,7 +52,7 @@
</div> </div>
<div class="r"> <div class="r">
<div class="title d-flex"> <div class="title d-flex">
<span class="f_20 c_333">订单号#{{this.model.orderNum}}<span class="line f_16 c_1B">|</span>2022-08-19</span> <span class="f_20 c_333">订单号#{{this.model.orderNum}}<span class="line f_16 c_1B">|</span>{{this.dingdaninfo.createTime}}</span>
<div class="right d-flex f_16"><span>数量</span><span>价格</span><span>总计</span></div> <div class="right d-flex f_16"><span>数量</span><span>价格</span><span>总计</span></div>
</div> </div>
<div class="d-flex orderDiv"> <div class="d-flex orderDiv">
@ -60,9 +60,9 @@
<p class="headline">配送至</p> <p class="headline">配送至</p>
<p class="text">河南省</p> <p class="text">河南省</p>
<p class="text">驻马店市 驿城区</p> <p class="text">驻马店市 驿城区</p>
<p class="text">黄淮学院南校区学府花园26号楼3602</p> <p class="text">{{this.dingdandh.address}}</p>
<p class="text">463000</p> <p class="text">{{this.dingdandh.zipCode}}</p>
<p class="headline">已发货</p> <p class="headline">{{this.dingdandh.deliveryStatus}}</p>
<p class="text">您的订单已经发出。</p> <p class="text">您的订单已经发出。</p>
<p class="headline">尊享免费配送，您的物流单号：</p> <p class="headline">尊享免费配送，您的物流单号：</p>
<p class="text">4263882788397</p> <p class="text">4263882788397</p>
@ -70,19 +70,19 @@
<div class="orderList "> <div class="orderList ">
<div class="item d-flex"> <div class="item d-flex">
<div class="img"> <div class="img">
<img src="../assets/cloth001.png"> <img src="{this.dingdaninfo.defaultPicture}">
</div> </div>
<div class="info"> <div class="info">
<p class="f_14 c_333 headline">商品名商品名商品名商品名商品</p> <p class="f_14 c_333 headline">{{this.dingdaninfo.goodsName}}</p>
<p class="d-flex">款式：<span>衬衫</span></p> <p class="d-flex">款式：<span>{{this.dingdaninfo.styleNames}}</span></p>
<p class="d-flex">尺码：<span>XXL</span></p> <p class="d-flex">尺码：<span>{{this.dingdaninfo.modelNumber}}</span></p>
<p class="d-flex">主辅料：<span>主料1，辅料2，辅料3，辅料4，辅料5，辅料6</span></p> <p class="d-flex">主辅料：<span>{{this.dingdaninfo.name}},{{this.dingdaninfo.typeName}}</span></p>
</div> </div>
<div class="right d-flex f_14 c_333"> <div class="right d-flex f_14 c_333">
<span>1</span><span>2478</span><span>2478</span> <span>{{this.dingdaninfo.goodsNum}}</span><span>{{this.dingdaninfo.unitPrice}}</span><span>{{this.dingdaninfo.payTotalPrice}}</span>
</div> </div>
</div> </div>
<div class="item d-flex"> <!--<div class="item d-flex">
<div class="img"> <div class="img">
<img src="../assets/cloth001.png"> <img src="../assets/cloth001.png">
</div> </div>
@ -95,24 +95,24 @@
<div class="right d-flex f_14 c_333"> <div class="right d-flex f_14 c_333">
<span>1</span><span>2478</span><span>2478</span> <span>1</span><span>2478</span><span>2478</span>
</div> </div>
</div> </div>-->
</div> </div>
</div> </div>
<div class="heji"> <div class="heji">
<p class="d-flex"> <p class="d-flex">
<span class="leftSide f_20" style="font-weight:500">购买人</span> <span class="leftSide f_20" style="font-weight:500">购买人</span>
<span class="midst f_16">小记</span> <span class="midst f_16">小记</span>
<span class="rightSide f_16" style="font-weight:500">4,956</span> <span class="rightSide f_16" style="font-weight:500">{{this.dingdaninfo.payTotalPrice}}</span>
</p> </p>
<p class="d-flex"> <p class="d-flex">
<span class="leftSide f_18">王贰</span> <span class="leftSide f_18">{{this.dingdaninfo.createBy}}</span>
<span class="midst f_16">运费总计</span> <span class="midst f_16">运费总计</span>
<span class="rightSide f_16" style="font-weight:500">0</span> <span class="rightSide f_16" style="font-weight:500">0</span>
</p> </p>
<p class="d-flex"> <p class="d-flex">
<span class="leftSide"></span> <span class="leftSide"></span>
<span class="midst f_20" style="font-weight:600">总计</span> <span class="midst f_20" style="font-weight:600">总计</span>
<span class="rightSide f_20" style="font-weight:600">4,956</span> <span class="rightSide f_20" style="font-weight:600">{{this.dingdaninfo.payTotalPrice}}</span>
</p> </p>
</div> </div>
</div> </div>
@ -126,6 +126,7 @@
<script> <script>
import Header from "../components/Header/HeaderView"; import Header from "../components/Header/HeaderView";
import Footer from "../components/Footer/FooterView" import Footer from "../components/Footer/FooterView"
import { httpAction, getAction } from '@/api/manage'
export default { export default {
name: "orderDetails", name: "orderDetails",
components: { Header,Footer }, components: { Header,Footer },
@ -135,14 +136,28 @@
model:{ model:{
id:'', id:'',
orderNum:'', orderNum:'',
name:'',
pay:false, pay:false,
receipt:false receipt:false
} },
dingdaninfo:{},
dingdandh:{},
url: {
list: "/starehouse/starehouse/list",
getdingdandh: "/sys/user/getdingdandh",
getdingdaninfo: "/sys/user/getdingdaninfo"
},
}; };
}, },
created() { created() {
this.getallgoods();
this.getdingdandh();
this.model.id = this.$route.query.id this.model.id = this.$route.query.id
this.model.orderNum = this.$route.query.orderNum this.model.orderNum = this.$route.query.orderNum
this.model.name = this.$route.query.name
this.model.pay = JSON.parse(this.$route.query.pay) this.model.pay = JSON.parse(this.$route.query.pay)
this.model.receipt = JSON.parse(this.$route.query.receipt) this.model.receipt = JSON.parse(this.$route.query.receipt)
switch (this.$route.query.key) { switch (this.$route.query.key) {
@ -156,7 +171,47 @@
this.current=6 this.current=6
break; break;
} }
},
methods: {
getdingdandh(){
getAction(this.url.getdingdandh,{ id: this.$route.query.id}).then((res) => {
if(res.success) {
this.dingdandh = res.result;
console.log("=====================")
console.log(res.result)
console.log(this.dingdandh)
console.log("=====================")
this.visible = true;
} else {
console.log("zbc--------------------")
}
});
},
getallgoods(){
getAction(this.url.getdingdaninfo,{ id: this.$route.query.id}).then((res) => {
if(res.success) {
this.dingdaninfo = res.result;
this.visible = true;
} else {
console.log("+++++++++++++++++++++")
}
});
}
}, },
}; };
</script> </script>
<style> <style>

1
jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
Unescape View File

@ -162,6 +162,7 @@ public class ShiroConfig {
filterChainDefinitionMap.put("/zygoods/zyGoods/fzlx","anon"); filterChainDefinitionMap.put("/zygoods/zyGoods/fzlx","anon");
filterChainDefinitionMap.put("/zygoods/zyGoods/cd","anon"); filterChainDefinitionMap.put("/zygoods/zyGoods/cd","anon");
filterChainDefinitionMap.put("/zygoods/zyGoods/lxlist","anon"); filterChainDefinitionMap.put("/zygoods/zyGoods/lxlist","anon");
filterChainDefinitionMap.put("/zygoods/zyGoods/lxlistxq","anon");
//filterChainDefinitionMap.put("/actTask/**", "anon"); //filterChainDefinitionMap.put("/actTask/**", "anon");
//filterChainDefinitionMap.put("/actProcessIns/**", "anon"); //filterChainDefinitionMap.put("/actProcessIns/**", "anon");

72
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zygoods/controller/ZyGoodsController.java
Unescape View File

@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils; 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.entity.ZyClothsType;
import org.jeecg.modules.demo.base.service.IZyClothsModularService; import org.jeecg.modules.demo.base.service.IZyClothsModularService;
import org.jeecg.modules.demo.base.service.IZyClothsTypeService; import org.jeecg.modules.demo.base.service.IZyClothsTypeService;
@ -123,6 +124,14 @@ public class ZyGoodsController extends JeecgController<ZyGoods, IZyGoodsService>
@ApiOperation(value="商品表-添加", notes="商品表-添加") @ApiOperation(value="商品表-添加", notes="商品表-添加")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<?> add(@RequestBody ZyGoods zyGoods,HttpServletRequest req) { public Result<?> add(@RequestBody ZyGoods zyGoods,HttpServletRequest req) {
ZyClothsStyle zyClothsStyle = zyClothsStyleService.getById(zyGoods.getStyleId());
zyGoods.setSpecification(zyClothsStyle.getSpecification());
zyGoods.setProductOverview(zyClothsStyle.getProductOverview());
zyGoods.setStructure(zyClothsStyle.getStructure());
zyGoods.setCharacteristic(zyClothsStyle.getCharacteristic());
zyGoods.setFoldingPackaging(zyClothsStyle.getFoldingPackaging());
zyGoods.setAccLogos(zyClothsStyle.getAccLogos());
zyGoods.setSewingForm(zyClothsStyle.getSewingForm());
zyGoodsService.save(zyGoods); zyGoodsService.save(zyGoods);
ZyStyleModule zyStyleModule = new ZyStyleModule(); ZyStyleModule zyStyleModule = new ZyStyleModule();
QueryWrapper<ZyStyleModule> queryWrapperzsm = QueryGenerator.initQueryWrapper(zyStyleModule, req.getParameterMap()); QueryWrapper<ZyStyleModule> queryWrapperzsm = QueryGenerator.initQueryWrapper(zyStyleModule, req.getParameterMap());
@ -171,6 +180,14 @@ public class ZyGoodsController extends JeecgController<ZyGoods, IZyGoodsService>
@ApiOperation(value="商品表-编辑", notes="商品表-编辑") @ApiOperation(value="商品表-编辑", notes="商品表-编辑")
@PutMapping(value = "/edit") @PutMapping(value = "/edit")
public Result<?> edit(@RequestBody ZyGoods zyGoods,HttpServletRequest req) { public Result<?> edit(@RequestBody ZyGoods zyGoods,HttpServletRequest req) {
ZyClothsStyle zyClothsStyle = zyClothsStyleService.getById(zyGoods.getStyleId());
zyGoods.setSpecification(zyClothsStyle.getSpecification());
zyGoods.setProductOverview(zyClothsStyle.getProductOverview());
zyGoods.setStructure(zyClothsStyle.getStructure());
zyGoods.setCharacteristic(zyClothsStyle.getCharacteristic());
zyGoods.setFoldingPackaging(zyClothsStyle.getFoldingPackaging());
zyGoods.setAccLogos(zyClothsStyle.getAccLogos());
zyGoods.setSewingForm(zyClothsStyle.getSewingForm());
zyGoodsService.updateById(zyGoods); zyGoodsService.updateById(zyGoods);
GoodsModule goodsModule = new GoodsModule(); GoodsModule goodsModule = new GoodsModule();
QueryWrapper<GoodsModule> queryWrappergm = QueryGenerator.initQueryWrapper(goodsModule, req.getParameterMap()); QueryWrapper<GoodsModule> queryWrappergm = QueryGenerator.initQueryWrapper(goodsModule, req.getParameterMap());
@ -451,7 +468,7 @@ public class ZyGoodsController extends JeecgController<ZyGoods, IZyGoodsService>
for(int i = 0 ; i < pageList.getRecords().size();i++){ for(int i = 0 ; i < pageList.getRecords().size();i++){
Zxdz zxdz = new Zxdz(); Zxdz zxdz = new Zxdz();
zxdz.setId(pageList.getRecords().get(i).getId()); 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.setPrice(pageList.getRecords().get(i).getUnitPrice());
zxdz.setTitle1(zyClothsTypeService.getById(pageList.getRecords().get(i).getClothsTypeId()).getTypeName()); zxdz.setTitle1(zyClothsTypeService.getById(pageList.getRecords().get(i).getClothsTypeId()).getTypeName());
zxdz.setTitle2(pageList.getRecords().get(i).getGoodsName()); zxdz.setTitle2(pageList.getRecords().get(i).getGoodsName());
@ -484,7 +501,7 @@ public class ZyGoodsController extends JeecgController<ZyGoods, IZyGoodsService>
for(int i = 0 ; i < pageList.getRecords().size();i++){ for(int i = 0 ; i < pageList.getRecords().size();i++){
Tcsp tcsp = new Tcsp(); Tcsp tcsp = new Tcsp();
tcsp.setId(pageList.getRecords().get(i).getId()); 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.setTime(pageList.getRecords().get(i).getUnitPrice());
tcsp.setTitle(pageList.getRecords().get(i).getGoodsName()); tcsp.setTitle(pageList.getRecords().get(i).getGoodsName());
tcspList.add(tcsp); tcspList.add(tcsp);
@ -526,7 +543,7 @@ public class ZyGoodsController extends JeecgController<ZyGoods, IZyGoodsService>
for(int j = 0 ; j < pageList.getRecords().size();j++){ for(int j = 0 ; j < pageList.getRecords().size();j++){
Fzlx fzlx = new Fzlx(); Fzlx fzlx = new Fzlx();
fzlx.setId(pageList.getRecords().get(j).getId()); 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.setTitle1(zyClothsTypeService.getById(pageList.getRecords().get(j).getClothsTypeId()).getTypeName());
fzlx.setTitle2(pageList.getRecords().get(j).getGoodsName()); fzlx.setTitle2(pageList.getRecords().get(j).getGoodsName());
String tag1 = zyClothsStyleService.getById(pageList.getRecords().get(j).getStyleId()).getCharacteristic(); String tag1 = zyClothsStyleService.getById(pageList.getRecords().get(j).getStyleId()).getCharacteristic();
@ -567,7 +584,7 @@ public class ZyGoodsController extends JeecgController<ZyGoods, IZyGoodsService>
for(int l = 0 ; l < pageListn.getRecords().size();l++){ for(int l = 0 ; l < pageListn.getRecords().size();l++){
Fzlx fzlx = new Fzlx(); Fzlx fzlx = new Fzlx();
fzlx.setId(pageListn.getRecords().get(l).getId()); 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.setTitle1(zyClothsTypeService.getById(pageListn.getRecords().get(l).getClothsTypeId()).getTypeName());
fzlx.setTitle2(pageListn.getRecords().get(l).getGoodsName()); fzlx.setTitle2(pageListn.getRecords().get(l).getGoodsName());
String tag1 = zyClothsStyleService.getById(pageListn.getRecords().get(l).getStyleId()).getCharacteristic(); String tag1 = zyClothsStyleService.getById(pageListn.getRecords().get(l).getStyleId()).getCharacteristic();
@ -608,7 +625,7 @@ public class ZyGoodsController extends JeecgController<ZyGoods, IZyGoodsService>
for(int n = 0 ; n < pageListt.getRecords().size();n++){ for(int n = 0 ; n < pageListt.getRecords().size();n++){
Fzlx fzlx = new Fzlx(); Fzlx fzlx = new Fzlx();
fzlx.setId(pageListt.getRecords().get(n).getId()); 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.setTitle1(zyClothsTypeService.getById(pageListt.getRecords().get(n).getClothsTypeId()).getTypeName());
fzlx.setTitle2(pageListt.getRecords().get(n).getGoodsName()); fzlx.setTitle2(pageListt.getRecords().get(n).getGoodsName());
String tag1 = zyClothsStyleService.getById(pageListt.getRecords().get(n).getStyleId()).getCharacteristic(); String tag1 = zyClothsStyleService.getById(pageListt.getRecords().get(n).getStyleId()).getCharacteristic();
@ -724,7 +741,7 @@ public class ZyGoodsController extends JeecgController<ZyGoods, IZyGoodsService>
for (int i = 0 ; i < pageList.size() ; i++){ for (int i = 0 ; i < pageList.size() ; i++){
FzlxSp fzlxSp = new FzlxSp(); FzlxSp fzlxSp = new FzlxSp();
fzlxSp.setId(pageList.get(i).getId()); 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.setCurrentPrice(pageList.get(i).getPromotionPrice());
fzlxSp.setHistoricalPrice(pageList.get(i).getUnitPrice()); fzlxSp.setHistoricalPrice(pageList.get(i).getUnitPrice());
fzlxSp.setTitle(pageList.get(i).getGoodsName()); fzlxSp.setTitle(pageList.get(i).getGoodsName());
@ -733,5 +750,48 @@ public class ZyGoodsController extends JeecgController<ZyGoods, IZyGoodsService>
} }
return Result.OK(listsp); 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);
}
} }

43
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zygoods/entity/Mk.java
Unescape View File

@ -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;
}

28
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zygoods/entity/ZyGoods.java
Unescape View File

@ -145,5 +145,33 @@ public class ZyGoods implements Serializable {
@Excel(name = "点击量", width = 15) @Excel(name = "点击量", width = 15)
@ApiModelProperty(value = "点击量") @ApiModelProperty(value = "点击量")
private java.lang.String click; private java.lang.String click;
/**规格*/
@Excel(name = "规格", width = 15)
@ApiModelProperty(value = "规格")
private java.lang.String specification;
/**产品概述*/
@Excel(name = "产品概述", width = 15)
@ApiModelProperty(value = "产品概述")
private java.lang.String productOverview;
/**结构*/
@Excel(name = "结构", width = 15)
@ApiModelProperty(value = "结构")
private java.lang.String structure;
/**特征*/
@Excel(name = "特征", width = 15)
@ApiModelProperty(value = "特征")
private java.lang.String characteristic;
/**折叠搭配及包装*/
@Excel(name = "折叠搭配及包装", width = 15)
@ApiModelProperty(value = "折叠搭配及包装")
private java.lang.String foldingPackaging;
/**配件及标志*/
@Excel(name = "配件及标志", width = 15)
@ApiModelProperty(value = "配件及标志")
private java.lang.String accLogos;
/**缝纫形式*/
@Excel(name = "缝纫形式", width = 15)
@ApiModelProperty(value = "缝纫形式")
private java.lang.String sewingForm;
} }

51
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
Unescape View File

@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.sun.scenario.effect.impl.sw.sse.SSEBlend_SRC_OUTPeer;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
@ -29,6 +30,8 @@ import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.*; import org.jeecg.common.util.*;
import org.jeecg.modules.demo.collecttype.entity.CollectType; import org.jeecg.modules.demo.collecttype.entity.CollectType;
import org.jeecg.modules.demo.collecttype.service.ICollectTypeService; import org.jeecg.modules.demo.collecttype.service.ICollectTypeService;
import org.jeecg.modules.demo.zygoods.entity.ZyGoods;
import org.jeecg.modules.orderbymakeclothplan.service.ZyOrderService;
import org.jeecg.modules.system.entity.*; import org.jeecg.modules.system.entity.*;
import org.jeecg.modules.system.model.DepartIdModel; import org.jeecg.modules.system.model.DepartIdModel;
import org.jeecg.modules.system.model.SysUserSysDepartModel; import org.jeecg.modules.system.model.SysUserSysDepartModel;
@ -60,6 +63,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.jeecg.modules.orderbymakeclothplan.pojo.ZyOrder;
/** /**
* <p> * <p>
@ -73,6 +77,9 @@ import java.util.stream.Collectors;
@RestController @RestController
@RequestMapping("/sys/user") @RequestMapping("/sys/user")
public class SysUserController { public class SysUserController {
@Autowired
private ZyOrderService orderService;
@Autowired @Autowired
private ISysBaseAPI sysBaseAPI; private ISysBaseAPI sysBaseAPI;
@ -1525,8 +1532,8 @@ public class SysUserController {
for (int i=0;i<gr1.size();i++){ for (int i=0;i<gr1.size();i++){
Grzx2 g2 = new Grzx2(); Grzx2 g2 = new Grzx2();
g2.setId(gr1.get(i).getId()); g2.setId(gr1.get(i).getId());
g2.setOrderNum(gr1.get(i).getTotalNum()); g2.setOrderNum(gr1.get(i).getOrdersNum());
g2.setPay("false"); g2.setPay(gr1.get(i).getDeliveryStatus());
g2.setReceipt("false"); g2.setReceipt("false");
g2.setUrl(gr1.get(i).getDefaultPicture()); g2.setUrl(gr1.get(i).getDefaultPicture());
g2.setName(gr1.get(i).getGoodsName()); g2.setName(gr1.get(i).getGoodsName());
@ -1541,10 +1548,42 @@ public class SysUserController {
return Result.ok(gr2); return Result.ok(gr2);
} }
/* public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
Groupx groupx = groupxService.getById(id);
return Result.OK(groupx);
}*/
/*
获取个人中心的订单详情
*/
@RequestMapping(value = "/getdingdaninfo", method = RequestMethod.GET)
public Result<?> findgoods(@RequestParam(name="id",required=true) String id) {
//这个是获取订单的数据中的商品数据
Grzx1 g1 = new Grzx1();
g1 = sysUserService.getallg2(id);
return Result.ok(g1);
}
/*
获取个人中心的订单详情的物流信息orderService
*/
@RequestMapping(value = "/getdingdandh", method = RequestMethod.GET)
public Result<?> getdingdandh(@RequestParam(name="id",required=true) String id) {
//这个是用于获取一个订单的全部信息
Grzx1 g1 = new Grzx1();
g1 = sysUserService.getallg2(id);
if (g1.getDeliveryStatus().equals("0")){
g1.setDeliveryStatus("未支付");
}
if (g1.getDeliveryStatus().equals("1")){
g1.setDeliveryStatus("已支付");
}
if (g1.getDeliveryStatus().equals("2")){
g1.setDeliveryStatus("申请退款");
}
if (g1.getDeliveryStatus().equals("3")){
g1.setDeliveryStatus("确认退款");
}
System.out.println(g1);
return Result.OK(g1);
}
} }

9
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
Unescape View File

@ -5,10 +5,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.jeecg.modules.orderbymakeclothplan.pojo.ZyOrder;
import org.jeecg.modules.system.entity.SysUser; import org.jeecg.modules.system.entity.SysUser;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.system.model.SysUserSysDepartModel; import org.jeecg.modules.system.model.SysUserSysDepartModel;
import org.jeecg.modules.system.vo.Grzx1; import org.jeecg.modules.system.vo.Grzx1;
import org.jeecg.modules.system.vo.Grzx2;
import org.jeecg.modules.system.vo.SysUserDepVo; import org.jeecg.modules.system.vo.SysUserDepVo;
import java.util.List; import java.util.List;
@ -155,4 +158,10 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
List<SysUser> queryByDepIds(@Param("departIds") List<String> departIds, @Param("username") String username); List<SysUser> queryByDepIds(@Param("departIds") List<String> departIds, @Param("username") String username);
List<Grzx1> getallgr1(String userid); List<Grzx1> getallgr1(String userid);
//这个是获取订单的数据中的商品数据
Grzx1 getallg2(String id);
@Select("select * from zy_order where id =#{id}")
ZyOrder getallzyo(String id);
} }

21
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
Unescape View File

@ -166,7 +166,9 @@
<!-- 根据用户名查询 --> <!-- 根据用户名查询 -->
<select id="getallgr1" resultType="org.jeecg.modules.system.vo.Grzx1"> <select id="getallgr1" resultType="org.jeecg.modules.system.vo.Grzx1">
SELECT og.id, zo.total_num , zg.goods_name , zcs.style_names,zsm.model_number,og.goods_num,zf.name,za.type_name,zg.default_picture,og.pay_total_price,og.unit_price FROM zy_order AS zo SELECT og.id, zo.orders_num , zg.goods_name , zcs.style_names,zsm.model_number,og.goods_num,zf.name,za.type_name,zg.default_picture,og.pay_total_price,og.unit_price,og.create_time,og.create_by ,
zo.delivery_status , zo.city_id ,zo.address,zo.zip_code
FROM zy_orders AS zo
INNER JOIN order_goods AS og ON zo.id = og.orders_id INNER JOIN order_goods AS og ON zo.id = og.orders_id
LEFT JOIN zy_goods AS zg ON og.goods_id = zg.id LEFT JOIN zy_goods AS zg ON og.goods_id = zg.id
LEFT JOIN zy_cloths_style AS zcs ON og.style_id = zcs.id LEFT JOIN zy_cloths_style AS zcs ON og.style_id = zcs.id
@ -179,4 +181,21 @@ WHERE og.create_by=#{userid}
</select> </select>
<!-- 这个是获取订单的数据中的商品数据 -->
<select id="getallg2" resultType="org.jeecg.modules.system.vo.Grzx1">
SELECT og.id, zo.orders_num , zg.goods_name , zcs.style_names,zsm.model_number,og.goods_num,zf.name,za.type_name,zg.default_picture,og.pay_total_price,og.unit_price,og.create_time,og.create_by ,
zo.delivery_status , zo.city_id ,zo.address,zo.zip_code
FROM zy_orders AS zo
INNER JOIN order_goods AS og ON zo.id = og.orders_id
LEFT JOIN zy_goods AS zg ON og.goods_id = zg.id
LEFT JOIN zy_cloths_style AS zcs ON og.style_id = zcs.id
LEFT JOIN zy_style_model AS zsm ON og.model_id = zsm.id
LEFT JOIN order_goods_fabric AS ogf ON ogf.order_goods_id = og.id
LEFT JOIN zy_fabric AS zf ON ogf.fabric_id = zf.id
LEFT JOIN order_goods_accessories AS oga ON oga.order_goods_id = og.id
LEFT JOIN zy_accessories AS za ON oga.accessories_id = za.id
WHERE og.id=#{id}
</select>
</mapper> </mapper>

8
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
Unescape View File

@ -7,9 +7,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.vo.SysUserCacheInfo; import org.jeecg.common.system.vo.SysUserCacheInfo;
import org.jeecg.modules.orderbymakeclothplan.pojo.ZyOrder;
import org.jeecg.modules.system.entity.SysUser; import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.model.SysUserSysDepartModel; import org.jeecg.modules.system.model.SysUserSysDepartModel;
import org.jeecg.modules.system.vo.Grzx1; import org.jeecg.modules.system.vo.Grzx1;
import org.jeecg.modules.system.vo.Grzx2;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.Collection; import java.util.Collection;
@ -255,4 +257,10 @@ public interface ISysUserService extends IService<SysUser> {
List<String> userIdToUsername(Collection<String> userIdList); List<String> userIdToUsername(Collection<String> userIdList);
List<Grzx1> getallgr1(String userid); List<Grzx1> getallgr1(String userid);
//这个是获取订单的数据中的商品数据
Grzx1 getallg2(String id);
//这个是用于获取一个订单的全部信息
ZyOrder getallzyo(String id);
} }

13
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
Unescape View File

@ -16,11 +16,13 @@ import org.jeecg.common.util.PasswordUtil;
import org.jeecg.common.util.UUIDGenerator; import org.jeecg.common.util.UUIDGenerator;
import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.base.service.BaseCommonService; import org.jeecg.modules.base.service.BaseCommonService;
import org.jeecg.modules.orderbymakeclothplan.pojo.ZyOrder;
import org.jeecg.modules.system.entity.*; import org.jeecg.modules.system.entity.*;
import org.jeecg.modules.system.mapper.*; import org.jeecg.modules.system.mapper.*;
import org.jeecg.modules.system.model.SysUserSysDepartModel; import org.jeecg.modules.system.model.SysUserSysDepartModel;
import org.jeecg.modules.system.service.ISysUserService; import org.jeecg.modules.system.service.ISysUserService;
import org.jeecg.modules.system.vo.Grzx1; import org.jeecg.modules.system.vo.Grzx1;
import org.jeecg.modules.system.vo.Grzx2;
import org.jeecg.modules.system.vo.SysUserDepVo; import org.jeecg.modules.system.vo.SysUserDepVo;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CacheEvict;
@ -548,4 +550,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
return userMapper.getallgr1(userid); return userMapper.getallgr1(userid);
} }
//这个是获取订单的数据中的商品数据
@Override
public Grzx1 getallg2(String id) {
return userMapper.getallg2(id);
}
@Override
public ZyOrder getallzyo(String id) {
return userMapper.getallzyo(id);
}
} }

15
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/Grzx1.java
Unescape View File

@ -8,7 +8,7 @@ public class Grzx1 {
//这个类主要适用于个人中心，主要目的是个人中心的全部订单页面，注意这里不是详情页，是列表的数据获取 //这个类主要适用于个人中心，主要目的是个人中心的全部订单页面，注意这里不是详情页，是列表的数据获取
private String id; private String id;
//订单编号 //订单编号
private String totalNum; private String ordersNum;
//商品名称 //商品名称
private String goodsName; private String goodsName;
//商品款式 //商品款式
@ -28,5 +28,18 @@ public class Grzx1 {
//单价 //单价
private String unitPrice; private String unitPrice;
//创建时间
private String createTime;
//创建人
private String createBy;
//城市
private String cityId;
//地址
private String address;
//邮编
private String zipCode;
//支付状态
private String deliveryStatus;
} }

1
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/vo/Grzx2.java
Unescape View File

@ -29,4 +29,5 @@ public class Grzx2 {
private String total; private String total;
} }

Write Preview
Loading…
Cancel
Save