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

zhc4dev
zhc077 2 years ago
commit f7ebbafa59
  1. 22
      ant-design-vue-jeecg/src/views/customercollectgoods/admin/CustomercollectgoodsList.vue
  2. 2
      ant-design-vue-jeecg/src/views/customercollectgoods/admin/modules/CustomercollectgoodsForm.vue
  3. 216
      ant-design-vue-jeecg/src/views/customercollectgoods/custom/CustomercollectgoodsList.vue
  4. 124
      ant-design-vue-jeecg/src/views/customercollectgoods/custom/modules/CustomercollectgoodsForm.vue
  5. 60
      ant-design-vue-jeecg/src/views/customercollectgoods/custom/modules/CustomercollectgoodsModal.vue
  6. 84
      ant-design-vue-jeecg/src/views/customercollectgoods/custom/modules/CustomercollectgoodsModal__Style#Drawer.vue
  7. 61
      ant-design-vue-jeecg/src/views/customerinvoice/admin/CustomerInvoiceList.vue
  8. 88
      ant-design-vue-jeecg/src/views/customerinvoice/admin/modules/CustomerInvoiceForm.vue
  9. 68
      ant-design-vue-jeecg/src/views/customermeasure/admin/CustomerMeasureList.vue
  10. 30
      ant-design-vue-jeecg/src/views/customermeasure/admin/modules/CustomerMeasureForm.vue
  11. 37
      ant-design-vue-jeecg/src/views/customerpayment/admin/CustomerPaymentList.vue
  12. 23
      ant-design-vue-jeecg/src/views/customerpayment/admin/modules/CustomerPaymentForm.vue
  13. 10
      ant-design-vue-jeecg/src/views/customerreceivingaddress/admin/CustomerReceivingAddressList.vue
  14. 50
      ant-design-vue-jeecg/src/views/customerreceivingaddress/admin/modules/CustomerReceivingAddressForm.vue
  15. 26
      ant-design-vue-jeecg/src/views/mall/user/ZyMallUserList.vue
  16. 775
      ant-design-vue-jeecg/src/views/zyclothsstyle/modules/ZyClothsStyleListDetail.vue
  17. 9
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/mapper/ZyStyleModularMapper.java
  18. 8
      jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/zyStyleModular/service/impl/ZyStyleModularServiceImpl.java
  19. 4
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsComponentServiceImpl.java
  20. 8
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsModularCompentServiceImpl.java
  21. 1
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/service/impl/ZyClothsTypeServiceImpl.java
  22. 7
      jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/service/impl/ZyProcessComponentServiceImpl.java
  23. 32
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customercollectgoods/controller/CustomercollectgoodsController.java
  24. 5
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customercollectgoods/entity/Customercollectgoods.java
  25. 127
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/controller/CustomerInvoiceController.java
  26. 16
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/entity/CustomerInvoice.java
  27. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/mapper/CustomerInvoiceMapper.java
  28. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/mapper/xml/CustomerInvoiceMapper.xml
  29. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/ICustomerInvoiceService.java
  30. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/service/impl/CustomerInvoiceServiceImpl.java
  31. 62
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/utils/UnifiedCreditCodeUtil.java
  32. 169
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/controller/CustomerMeasureController.java
  33. 11
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/entity/CustomerMeasure.java
  34. 5
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/mapper/CustomerMeasureMapper.java
  35. 6
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/service/ICustomerMeasureService.java
  36. 5
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/service/impl/CustomerMeasureServiceImpl.java
  37. 75
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/controller/CustomerPaymentController.java
  38. 30
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/entity/CustomerPayment.java
  39. 5
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/mapper/CustomerPaymentMapper.java
  40. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/service/ICustomerPaymentService.java
  41. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/service/impl/CustomerPaymentServiceImpl.java
  42. 416
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/utils/BankUtil.java
  43. 63
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerreceivingaddress/controller/CustomerReceivingAddressController.java
  44. 41
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerreceivingaddress/entity/CustomerReceivingAddress.java
  45. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerreceivingaddress/mapper/CustomerReceivingAddressMapper.java
  46. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerreceivingaddress/service/ICustomerReceivingAddressService.java
  47. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerreceivingaddress/service/impl/CustomerReceivingAddressServiceImpl.java
  48. 4
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyaccessories/service/impl/ZyStyleAccessoriesServiceImpl.java
  49. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/controller/ZyClothsStyleController.java
  50. 4
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/entity/vo/AllClothStyle.java
  51. 20
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zyclothsstyle/service/impl/ZyClothsStyleServiceImpl.java
  52. 8
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylefabric/mapper/ZyStyleFabricMapper.java
  53. 16
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodel/entity/ZyStyleModel.java
  54. 3
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodel/mapper/ZyStyleModelMapper.java
  55. 3
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodel/service/IZyStyleModelService.java
  56. 90
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodel/service/impl/ZyStyleModelServiceImpl.java
  57. 113
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/controller/ZyStyleModuleController.java
  58. 4
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/mapper/ZyStyleModuleMapper.java
  59. 7
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/IZyStyleModuleService.java
  60. 50
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/zystylemodule/service/impl/ZyStyleModuleServiceImpl.java

@ -1,9 +1,29 @@
<template>
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="用户">
<j-select-user-by-dep placeholder="请选择用户" v-model="queryParam.userId"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="商品">
<j-search-select-tag placeholder="请选择商品" v-model="queryParam.goodsId" dict="zy_goods,goods_name,id"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</span>
</a-col>
</a-row>
</a-form>
</div>

@ -10,7 +10,7 @@
</a-col>
<a-col :span="24">
<a-form-model-item label="商品" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsId">
<j-search-select-tag v-model="model.goodsId" dict="" />
<j-search-select-tag v-model="model.goodsId" dict="zy_goods,goods_name,id" />
</a-form-model-item>
</a-col>
<a-col :span="24">

@ -0,0 +1,216 @@
<template>
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="用户">
<j-select-user-by-dep placeholder="请选择用户" v-model="queryParam.userId"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="商品">
<j-search-select-tag placeholder="请选择商品" v-model="queryParam.goodsId" dict="zy_goods,goods_name,id"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</span>
</a-col>
</a-row>
</a-form>
</div>
<!-- 查询区域-END -->
<!-- 操作按钮区域 -->
<div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('收藏商品(衣橱)')">导出</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button>
</a-upload>
<!-- 高级查询区域 -->
<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
</a-menu>
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
</a-dropdown>
</div>
<!-- table区域-begin -->
<div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>
<a style="margin-left: 24px" @click="onClearSelected">清空</a>
</div>
<a-table
ref="table"
size="middle"
:scroll="{x:true}"
bordered
rowKey="id"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
class="j-table-force-nowrap"
@change="handleTableChange">
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
<template slot="imgSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
<img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
</template>
<template slot="fileSlot" slot-scope="text">
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
<a-button
v-else
:ghost="true"
type="primary"
icon="download"
size="small"
@click="downloadFile(text)">
下载
</a-button>
</template>
<span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
<a-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
<a-menu slot="overlay">
<a-menu-item>
<a @click="handleDetail(record)">详情</a>
</a-menu-item>
<a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
</a-dropdown>
</span>
</a-table>
</div>
<customercollectgoods-modal ref="modalForm" @ok="modalFormOk"></customercollectgoods-modal>
</a-card>
</template>
<script>
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import CustomercollectgoodsModal from './modules/CustomercollectgoodsModal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
export default {
name: 'CustomercollectgoodsList',
mixins:[JeecgListMixin, mixinDevice],
components: {
CustomercollectgoodsModal
},
data () {
return {
description: '收藏商品(衣橱)管理页面',
//
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:60,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{
title:'用户',
align:"center",
dataIndex: 'userId_dictText'
},
{
title:'商品',
align:"center",
dataIndex: 'goodsId_dictText'
},
{
title:'当前单价',
align:"center",
dataIndex: 'price'
},
{
title:'数量',
align:"center",
dataIndex: 'number'
},
{
title:'收藏夹',
align:"center",
dataIndex: 'collectTypeId_dictText'
},
{
title: '操作',
dataIndex: 'action',
align:"center",
fixed:"right",
width:147,
scopedSlots: { customRender: 'action' }
}
],
url: {
list: "/customercollectgoods/customercollectgoods/listcustom",
delete: "/customercollectgoods/customercollectgoods/delete",
deleteBatch: "/customercollectgoods/customercollectgoods/deleteBatch",
exportXlsUrl: "/customercollectgoods/customercollectgoods/exportXls",
importExcelUrl: "customercollectgoods/customercollectgoods/importExcel",
},
dictOptions:{},
superFieldList:[],
}
},
created() {
this.getSuperFieldList();
},
computed: {
importExcelUrl: function(){
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
methods: {
initDictConfig(){
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'sel_user',value:'userId',text:'用户'})
fieldList.push({type:'sel_search',value:'goodsId',text:'商品',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'price',text:'当前单价',dictCode:''})
fieldList.push({type:'string',value:'number',text:'数量',dictCode:''})
fieldList.push({type:'sel_search',value:'collectTypeId',text:'收藏夹',dictTable:'collect_type', dictText:'collect_type_name', dictCode:'id'})
this.superFieldList = fieldList
}
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

@ -0,0 +1,124 @@
<template>
<a-spin :spinning="confirmLoading">
<j-form-container :disabled="formDisabled">
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row>
<a-col :span="24">
<a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
<j-select-user-by-dep v-model="model.userId" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="商品" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="goodsId">
<j-search-select-tag v-model="model.goodsId" dict="zy_goods,goods_name,id" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="当前单价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price">
<a-input v-model="model.price" placeholder="请输入当前单价" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="number">
<a-input v-model="model.number" placeholder="请输入数量" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="收藏夹" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="collectTypeId">
<j-search-select-tag v-model="model.collectTypeId" dict="collect_type,collect_type_name,id" />
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</j-form-container>
</a-spin>
</template>
<script>
import { httpAction, getAction } from '@/api/manage'
import { validateDuplicateValue } from '@/utils/util'
export default {
name: 'CustomercollectgoodsForm',
components: {
},
props: {
//
disabled: {
type: Boolean,
default: false,
required: false
}
},
data () {
return {
model:{
},
labelCol: {
xs: { span: 24 },
sm: { span: 5 },
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 },
},
confirmLoading: false,
validatorRules: {
},
url: {
add: "/customercollectgoods/customercollectgoods/add",
edit: "/customercollectgoods/customercollectgoods/edit",
queryById: "/customercollectgoods/customercollectgoods/queryById"
}
}
},
computed: {
formDisabled(){
return this.disabled
},
},
created () {
//model
this.modelDefault = JSON.parse(JSON.stringify(this.model));
},
methods: {
add () {
this.edit(this.modelDefault);
},
edit (record) {
this.model = Object.assign({}, record);
this.visible = true;
},
submitForm () {
const that = this;
//
this.$refs.form.validate(valid => {
if (valid) {
that.confirmLoading = true;
let httpurl = '';
let method = '';
if(!this.model.id){
httpurl+=this.url.add;
method = 'post';
}else{
httpurl+=this.url.edit;
method = 'put';
}
httpAction(httpurl,this.model,method).then((res)=>{
if(res.success){
that.$message.success(res.message);
that.$emit('ok');
}else{
that.$message.warning(res.message);
}
}).finally(() => {
that.confirmLoading = false;
})
}
})
},
}
}
</script>

@ -0,0 +1,60 @@
<template>
<j-modal
:title="title"
:width="width"
:visible="visible"
switchFullscreen
@ok="handleOk"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
@cancel="handleCancel"
cancelText="关闭">
<customercollectgoods-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></customercollectgoods-form>
</j-modal>
</template>
<script>
import CustomercollectgoodsForm from './CustomercollectgoodsForm'
export default {
name: 'CustomercollectgoodsModal',
components: {
CustomercollectgoodsForm
},
data () {
return {
title:'',
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
})
},
close () {
this.$emit('close');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleCancel () {
this.close()
}
}
}
</script>

@ -0,0 +1,84 @@
<template>
<a-drawer
:title="title"
:width="width"
placement="right"
:closable="false"
@close="close"
destroyOnClose
:visible="visible">
<customercollectgoods-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></customercollectgoods-form>
<div class="drawer-footer">
<a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
<a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
</div>
</a-drawer>
</template>
<script>
import CustomercollectgoodsForm from './CustomercollectgoodsForm'
export default {
name: 'CustomercollectgoodsModal',
components: {
CustomercollectgoodsForm
},
data () {
return {
title:"操作",
width:800,
visible: false,
disableSubmit: false
}
},
methods: {
add () {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.add();
})
},
edit (record) {
this.visible=true
this.$nextTick(()=>{
this.$refs.realForm.edit(record);
});
},
close () {
this.$emit('close');
this.visible = false;
},
submitCallback(){
this.$emit('ok');
this.visible = false;
},
handleOk () {
this.$refs.realForm.submitForm();
},
handleCancel () {
this.close()
}
}
}
</script>
<style lang="less" scoped>
/** Button按钮间距 */
.ant-btn {
margin-left: 30px;
margin-bottom: 30px;
float: right;
}
.drawer-footer{
position: absolute;
bottom: -8px;
width: 100%;
border-top: 1px solid #e8e8e8;
padding: 10px 16px;
text-align: right;
left: 0;
background: #fff;
border-radius: 0 0 2px 2px;
}
</style>

@ -4,6 +4,38 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="用户">
<j-search-select-tag placeholder="请选择用户" v-model="queryParam.userId" dict="sys_user,realname,id"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="客户类型">
<j-dict-select-tag placeholder="请选择客户类型" v-model="queryParam.customerType" dictCode="khlx"/>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="发票类型">
<j-dict-select-tag placeholder="请选择发票类型" v-model="queryParam.invoiceType" dictCode="fplx"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="名称/姓名">
<a-input placeholder="请输入名称/姓名" v-model="queryParam.name"></a-input>
</a-form-item>
</a-col>
</template>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</span>
</a-col>
</a-row>
</a-form>
</div>
@ -122,11 +154,7 @@
return parseInt(index)+1;
}
},
{
title:'创建日期',
align:"center",
dataIndex: 'createTime'
},
{
title:'用户',
align:"center",
@ -143,7 +171,7 @@
dataIndex: 'invoiceType_dictText'
},
{
title:'名称',
title:'名称/姓名',
align:"center",
dataIndex: 'name'
},
@ -152,25 +180,31 @@
align:"center",
dataIndex: 'taxIdentificationNumber'
},
{
/* {
title:'地址',
align:"center",
dataIndex: 'address'
},
},*/
{
title:'电话',
align:"center",
dataIndex: 'telephone'
},
{
title:'账号',
align:"center",
dataIndex: 'accountNumber'
},
{
title:'开户行',
align:"center",
dataIndex: 'bankDeposit'
},
{
title:'账号',
title:'创建日期',
align:"center",
dataIndex: 'accountNumber'
dataIndex: 'createTime'
},
{
title:'排序',
@ -193,7 +227,7 @@
deleteBatch: "/customerinvoice/customerInvoice/deleteBatch",
exportXlsUrl: "/customerinvoice/customerInvoice/exportXls",
importExcelUrl: "customerinvoice/customerInvoice/importExcel",
},
dictOptions:{},
superFieldList:[],
@ -213,10 +247,11 @@
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
fieldList.push({type:'sel_user',value:'userId',text:'用户'})
fieldList.push({type:'sel_search',value:'userId',text:'用户',dictTable:'sys_user', dictText:'realname', dictCode:'id'})
fieldList.push({type:'popup',value:'username',text:'用户', popup:{code:'findcust',field:'id',orgFields:'id',destFields:'user_id'}})
fieldList.push({type:'string',value:'customerType',text:'客户类型',dictCode:'khlx'})
fieldList.push({type:'string',value:'invoiceType',text:'发票类型',dictCode:'fplx'})
fieldList.push({type:'string',value:'name',text:'名称',dictCode:''})
fieldList.push({type:'string',value:'name',text:'名称/姓名',dictCode:''})
fieldList.push({type:'string',value:'taxIdentificationNumber',text:'纳税人识别号',dictCode:''})
fieldList.push({type:'string',value:'address',text:'地址',dictCode:''})
fieldList.push({type:'string',value:'telephone',text:'电话',dictCode:''})

@ -3,62 +3,97 @@
<j-form-container :disabled="formDisabled">
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row>
<a-col :span="24">
<a-form-model-item label="创建日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="createTime">
<j-date placeholder="请选择创建日期" v-model="model.createTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
<j-select-user-by-dep v-model="model.userId" />
<a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="username">
<j-popup
style="max-width:none; width: 200%"
v-model="model.username"
field="username"
org-fields="id,realname"
dest-fields="userId,username"
code="findcust"
:multi="true"
@input="popupCallback"
/>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="24">
<a-form-model-item label="客户类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="customerType">
<j-dict-select-tag type="list" v-model="model.customerType" dictCode="khlx" placeholder="请选择客户类型" />
<j-dict-select-tag type="radio" v-model="model.customerType" dictCode="khlx" placeholder="请选择客户类型" style="max-width:none; width: 200%"/>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="24">
<a-form-model-item label="发票类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="invoiceType">
<j-dict-select-tag type="list" v-model="model.invoiceType" dictCode="fplx" placeholder="请选择发票类型" />
<j-dict-select-tag type="radio" v-model="model.invoiceType" dictCode="fplx" placeholder="请选择发票类型" style="max-width:none; width: 200%"/>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="24">
<a-form-model-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
<a-input v-model="model.name" placeholder="请输入名称" ></a-input>
<a-form-model-item label="名称/姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
<a-input v-model="model.name" placeholder="请输入名称/姓名" style="max-width:none; width: 200%"></a-input>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="24">
<a-form-model-item label="纳税人识别号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="taxIdentificationNumber">
<a-input v-model="model.taxIdentificationNumber" placeholder="请输入纳税人识别号" ></a-input>
<a-input v-model="model.taxIdentificationNumber" placeholder="请输入纳税人识别号" style="max-width:none; width: 200%"></a-input>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="24">
<a-form-model-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
<a-input v-model="model.address" placeholder="请输入地址" ></a-input>
<a-textarea v-model="model.address" rows="4" placeholder="请输入地址" style="max-width:none; width: 200%"/>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="24">
<a-form-model-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="telephone">
<a-input v-model="model.telephone" placeholder="请输入电话" ></a-input>
<a-input v-model="model.telephone" placeholder="请输入电话" style="max-width:none; width: 200%"></a-input>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="24">
<a-form-model-item label="开户行" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bankDeposit">
<a-input v-model="model.bankDeposit" placeholder="请输入开户行" ></a-input>
<a-form-model-item label="账号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="accountNumber">
<a-input v-model="model.accountNumber" placeholder="请输入账号" style="max-width:none; width: 200%"></a-input>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="24">
<a-form-model-item label="账号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="accountNumber">
<a-input v-model="model.accountNumber" placeholder="请输入账号" ></a-input>
<a-form-model-item label="开户行" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bankDeposit">
<a-input style="max-width:none; width: 200%" v-model="model.bankDeposit" placeholder="请输入开户行" disabled></a-input>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="24">
<a-form-model-item label="排序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sort">
<a-input-number v-model="model.sort" placeholder="请输入排序" style="width: 100%" />
<a-input-number v-model="model.sort" placeholder="请输入排序" style="max-width:none; width: 200%" />
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="24">
<a-form-model-item label="创建日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="createTime">
<j-date placeholder="请选择创建日期" v-model="model.createTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" disabled/>
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</j-form-container>
</a-spin>
@ -95,6 +130,18 @@
},
confirmLoading: false,
validatorRules: {
username: [
{ required: true, message: '请输入用户!'},
],
customerType: [
{ required: true, message: '请输入客户类型!'},
],
invoiceType: [
{ required: true, message: '请输入发票类型!'},
],
name: [
{ required: true, message: '请输入名称/姓名!'},
],
telephone: [
{ required: false},
{ pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'},
@ -153,6 +200,9 @@
})
},
popupCallback(value,row){
this.model = Object.assign(this.model, row);
},
}
}
</script>

@ -6,7 +6,7 @@
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="用户">
<j-select-user-by-dep placeholder="请选择用户" v-model="queryParam.userId"/>
<j-search-select-tag placeholder="请选择用户" v-model="queryParam.userId" dict="sys_user,realname,id"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
@ -162,6 +162,7 @@
{
title:'排序',
align:"center",
sorter: true,
dataIndex: 'sort'
},
{
@ -174,6 +175,21 @@
align:"center",
dataIndex: 'weight'
},
{
title:'下摆(厘米)',
align:"center",
dataIndex: 'hem'
},
{
title:'袖口(厘米)',
align:"center",
dataIndex: 'cuff'
},
{
title:'袖长(厘米)',
align:"center",
dataIndex: 'sleeveLength'
},
{
title:'胸围(厘米)',
align:"center",
@ -189,10 +205,55 @@
align:"center",
dataIndex: 'shoulderWidth'
},
{
title:'前身长(厘米)',
align:"center",
dataIndex: 'forebodyLength'
},
{
title:'领围(厘米)',
align:"center",
dataIndex: 'neck'
},
{
title:'臀围(厘米)',
align:"center",
dataIndex: 'hipline'
},
{
title:'衣长',
align:"center",
dataIndex: 'length'
},
{
title:'胸距',
align:"center",
dataIndex: 'sternalDistance'
},
{
title:'量体方式',
align:"center",
dataIndex: 'measurementMethod_dictText'
},
{
title:'量体店铺',
align:"center",
dataIndex: 'storeId_dictText'
},
{
title:'量体设备',
align:"center",
dataIndex: 'deviceId_dictText'
},
{
title:'量体师',
align:"center",
dataIndex: 'measurerId_dictText'
},
{
title:'量体时间',
align:"center",
dataIndex: 'measurementTime'
dataIndex: 'createTime'
},
{
title: '操作',
@ -228,7 +289,8 @@
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'sel_user',value:'userId',text:'用户'})
fieldList.push({type:'sel_search',value:'userId',text:'用户',dictTable:'sys_user', dictText:'realname', dictCode:'id'})
fieldList.push({type:'popup',value:'username',text:'用户名', popup:{code:'findcust',field:'id',orgFields:'id',destFields:'user_id'}})
fieldList.push({type:'int',value:'sort',text:'排序',dictCode:''})
fieldList.push({type:'double',value:'height',text:'身高(厘米)',dictCode:''})
fieldList.push({type:'double',value:'weight',text:'体重(千克)',dictCode:''})

@ -4,18 +4,26 @@
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row>
<a-col :span="24">
<a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
<j-select-user-by-dep v-model="model.userId" />
<a-form-model-item label="用户名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="username">
<j-popup
v-model="model.username"
field="username"
org-fields="id,realname"
dest-fields="userId,username"
code="findcust"
:multi="true"
@input="popupCallback"
/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="排序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sort">
<a-input-number v-model="model.sort" placeholder="请输入排序" style="width: 100%" />
<a-input-number v-model="model.sort" placeholder="请输入排序" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="身高(厘米)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="height">
<a-input-number v-model="model.height" placeholder="请输入身高(厘米)" style="width: 100%" />
<a-input-number v-model="model.height" placeholder="请输入身高(厘米)" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
@ -70,17 +78,17 @@
</a-col>
<a-col :span="24">
<a-form-model-item label="衣长" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="length">
<a-input-number v-model="model.length" placeholder="请输入衣长" style="width: 100%" />
<a-input-number v-model="model.length" placeholder="请输入衣长(厘米)" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="胸距" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sternalDistance">
<a-input-number v-model="model.sternalDistance" placeholder="请输入胸距" style="width: 100%" />
<a-input-number v-model="model.sternalDistance" placeholder="请输入胸距(厘米)" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="量体方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="measurementMethod">
<j-dict-select-tag type="list" v-model="model.measurementMethod" dictCode="ctfs" placeholder="请选择量体方式" />
<j-dict-select-tag type="radio" v-model="model.measurementMethod" dictCode="ctfs" placeholder="请选择量体方式" />
</a-form-model-item>
</a-col>
<a-col :span="24">
@ -98,11 +106,6 @@
<j-select-user-by-dep v-model="model.measurerId" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="量体时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="measurementTime">
<j-date placeholder="请选择量体时间" v-model="model.measurementTime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</j-form-container>
@ -194,6 +197,9 @@
})
},
popupCallback(value,row){
this.model = Object.assign(this.model, row);
},
}
}
</script>

@ -6,7 +6,7 @@
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="用户">
<j-select-user-by-dep placeholder="请选择用户" v-model="queryParam.userId"/>
<j-search-select-tag placeholder="请选择用户" v-model="queryParam.userId" dict="sys_user,realname,id"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
@ -154,26 +154,8 @@
return parseInt(index)+1;
}
},
{
title:'创建人',
align:"center",
dataIndex: 'createBy'
},
{
title:'创建日期',
align:"center",
dataIndex: 'createTime'
},
{
title:'更新人',
align:"center",
dataIndex: 'updateBy'
},
{
title:'更新日期',
align:"center",
dataIndex: 'updateTime'
},
{
title:'用户',
align:"center",
@ -194,6 +176,16 @@
align:"center",
dataIndex: 'bankDeposit'
},
{
title:'创建人',
align:"center",
dataIndex: 'createBy'
},
{
title:'创建日期',
align:"center",
dataIndex: 'createTime'
},
{
title: '操作',
dataIndex: 'action',
@ -232,7 +224,8 @@
fieldList.push({type:'datetime',value:'createTime',text:'创建日期'})
fieldList.push({type:'string',value:'updateBy',text:'更新人',dictCode:''})
fieldList.push({type:'datetime',value:'updateTime',text:'更新日期'})
fieldList.push({type:'sel_user',value:'userId',text:'用户'})
fieldList.push({type:'sel_search',value:'userId',text:'用户',dictTable:'sys_user', dictText:'realname', dictCode:'id'})
fieldList.push({type:'popup',value:'username',text:'用户', popup:{code:'findcust',field:'id',orgFields:'id',destFields:'user_id'}})
fieldList.push({type:'string',value:'paymentType',text:'支付类型',dictCode:'zflx'})
fieldList.push({type:'string',value:'accountNo',text:'账号/卡号',dictCode:''})
fieldList.push({type:'string',value:'bankDeposit',text:'开户银行',dictCode:''})

@ -4,13 +4,21 @@
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row>
<a-col :span="24">
<a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
<j-select-user-by-dep v-model="model.userId" />
<a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="username">
<j-popup
v-model="model.username"
field="username"
org-fields="id,realname"
dest-fields="userId,username"
code="findcust"
:multi="true"
@input="popupCallback"
/>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="支付类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paymentType">
<j-dict-select-tag type="list" v-model="model.paymentType" dictCode="zflx" placeholder="请选择支付类型" />
<j-dict-select-tag type="radio" v-model="model.paymentType" dictCode="zflx" placeholder="请选择支付类型" />
</a-form-model-item>
</a-col>
<a-col :span="24">
@ -18,9 +26,9 @@
<a-input v-model="model.accountNo" placeholder="请输入账号/卡号" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-col :span="24" v-if="this.model.accountNo==2">
<a-form-model-item label="开户银行" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bankDeposit">
<a-input v-model="model.bankDeposit" placeholder="请输入开户银行" ></a-input>
<a-input v-model="model.bankDeposit" placeholder="请输入开户银行" disabled ></a-input>
</a-form-model-item>
</a-col>
</a-row>
@ -111,9 +119,12 @@
that.confirmLoading = false;
})
}
})
},
popupCallback(value,row){
this.model = Object.assign(this.model, row);
},
}
}
</script>

@ -6,7 +6,7 @@
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="用户">
<j-select-user-by-dep placeholder="请选择用户" v-model="queryParam.userId"/>
<j-search-select-tag placeholder="请选择用户" v-model="queryParam.userId" dict="sys_user,realname,id"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
@ -129,6 +129,7 @@
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import CustomerReceivingAddressModal from './modules/CustomerReceivingAddressModal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
import Area from '@/components/_util/Area'
export default {
@ -191,7 +192,7 @@
{
title:'标识',
align:"center",
dataIndex: 'labelcl'
dataIndex: 'labelcl_dictText'
},
{
title: '操作',
@ -232,14 +233,15 @@
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'sel_user',value:'userId',text:'用户'})
fieldList.push({type:'sel_search',value:'userId',text:'用户',dictTable:'sys_user', dictText:'realname', dictCode:'id'})
fieldList.push({type:'popup',value:'usernamme',text:'用户', popup:{code:'findcust',field:'id',orgFields:'id',destFields:'user_id'}})
fieldList.push({type:'pca',value:'cityId',text:'城市'})
fieldList.push({type:'string',value:'address',text:'地址',dictCode:''})
fieldList.push({type:'string',value:'zipCode',text:'邮编',dictCode:''})
fieldList.push({type:'string',value:'receiver',text:'收货人',dictCode:''})
fieldList.push({type:'string',value:'mobile',text:'联系电话',dictCode:''})
fieldList.push({type:'int',value:'sort',text:'排序',dictCode:''})
fieldList.push({type:'string',value:'labelcl',text:'标识',dictCode:''})
fieldList.push({type:'string',value:'labelcl',text:'标识',dictCode:'shdzbs'})
this.superFieldList = fieldList
}
}

@ -4,43 +4,66 @@
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row>
<a-col :span="24">
<a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
<j-select-user-by-dep v-model="model.userId" />
<a-form-model-item label="用户" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="usernamme">
<j-popup
style="max-width:none; width: 200%"
v-model="model.usernamme"
field="usernamme"
org-fields="id,realname"
dest-fields="userId,usernamme"
code="findcust"
:multi="true"
@input="popupCallback"
/>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="24">
<a-form-model-item label="城市" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cityId">
<j-area-linkage type="cascader" v-model="model.cityId" placeholder="请输入省市区" />
<j-area-linkage style="max-width:none; width: 200%" type="cascader" v-model="model.cityId" placeholder="请输入省市区" />
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="24">
<a-form-model-item label="地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address">
<a-input v-model="model.address" placeholder="请输入地址" ></a-input>
<a-textarea style="max-width:none; width: 200%" v-model="model.address" rows="4" placeholder="请输入地址" />
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="24">
<a-form-model-item label="邮编" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zipCode">
<a-input v-model="model.zipCode" placeholder="请输入邮编" ></a-input>
<a-input style="max-width:none; width: 200%" v-model="model.zipCode" placeholder="请输入邮编" ></a-input>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="24">
<a-form-model-item label="收货人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="receiver">
<a-input v-model="model.receiver" placeholder="请输入收货人" ></a-input>
<a-input style="max-width:none; width: 200%" v-model="model.receiver" placeholder="请输入收货人" ></a-input>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="24">
<a-form-model-item label="联系电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="mobile">
<a-input v-model="model.mobile" placeholder="请输入联系电话" ></a-input>
<a-input style="max-width:none; width: 200%" v-model="model.mobile" placeholder="请输入联系电话" ></a-input>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="24">
<a-form-model-item label="排序" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sort">
<a-input-number v-model="model.sort" placeholder="请输入排序" style="width: 100%" />
<a-input-number style="max-width:none; width: 200%" v-model="model.sort" placeholder="请输入排序" />
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="24">
<a-form-model-item label="标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="labelcl">
<a-input v-model="model.labelcl" placeholder="请输入标识" ></a-input>
<j-dict-select-tag style="max-width:none; width: 200%" type="radio" v-model="model.labelcl" dictCode="shdzbs" placeholder="请选择标识" />
</a-form-model-item>
</a-col>
</a-row>
@ -80,8 +103,12 @@
},
confirmLoading: false,
validatorRules: {
zipCode: [
{ required: true, message: '请输入邮编!'},
{ pattern: /^[1-9]\d{5}$/, message: '请输入正确的邮政编码!'},
],
mobile: [
{ required: false},
{ required: true, message: '请输入联系电话!'},
{ pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'},
],
},
@ -138,6 +165,9 @@
})
},
popupCallback(value,row){
this.model = Object.assign(this.model, row);
},
}
}
</script>

@ -134,7 +134,7 @@
</a-table>
</div>
<a-tabs defaultActiveKey="1">
<!--<a-tabs defaultActiveKey="1">
<a-tab-pane tab="地址表" key="1">
<ZyMallAddressList :mainId="selectedMainId" />
</a-tab-pane>
@ -153,7 +153,7 @@
<a-tab-pane tab="退货订单" key="6" forceRender>
<ZyMallReturnOrderList :mainId="selectedMainId" />
</a-tab-pane>
</a-tabs>
</a-tabs>-->
<zyMallUser-modal ref="modalForm" @ok="modalFormOk"></zyMallUser-modal>
</a-card>
@ -190,36 +190,36 @@ export default {
//
columns: [
{
title: '账户',
title: '账户c',
align: 'center',
dataIndex: 'account'
dataIndex: 'username'
},
{
title: '昵称',
align: 'center',
dataIndex: 'name'
dataIndex: 'realname'
},
{
/* {
title: '密码',
align: 'center',
dataIndex: 'password'
},
},*/
{
title: '电话',
align: 'center',
dataIndex: 'phone'
},
{
/* {
title: '状态',
align: 'center',
dataIndex: 'state_dictText'
},
},*/
{
title: '性别',
align: 'center',
dataIndex: 'sex_dictText'
},
{
/* {
title: '个性签名',
align: 'center',
dataIndex: 'sign'
@ -229,8 +229,8 @@ export default {
align: 'center',
dataIndex: 'picture',
scopedSlots: { customRender: 'imgSlot' }
},
{
},*/
/* {
title: '店铺id',
align: 'center',
dataIndex: 'shopId_dictText'
@ -249,7 +249,7 @@ export default {
title: '身份',
align: 'center',
dataIndex: 'userIdentity_dictText'
},
},*/
{
title: '生日',
align: 'center',

@ -8,410 +8,419 @@
:width='1000'
@ok="handleOk"
@cancel="handleCancel">
<!-- <table border="1" style="width: 98%;font-size:14px;margin:30px auto 0" class="table">-->
<!-- <tr>-->
<!-- <td><span>款式名称</span>tttt</td>-->
<!-- <td><span>款式编号</span>QIYE80301100000130</td>-->
<!-- <td><span>款式规格</span>123</td>-->
<!-- <td><span>款式形式</span>预制</td>-->
<!-- </tr>-->
<!-- <tr>-->
<!-- <td><span>企业</span>黄淮服装智能制造中心</td>-->
<!-- <td><span>款式创建时间</span>2022-12-06 10:02:59</td>-->
<!-- &lt;!&ndash; 模块&ndash;&gt;-->
<!-- <td><span>服装类型</span>tttt</td>-->
<!-- <td><span>模块编号</span>QIYE80301100000130</td>-->
<!-- </tr>-->
<!-- <tr>-->
<!-- <td><span>模块名称</span>2</td>-->
<!-- <td><span>模块创建时间</span>2022-12-06 10:02:59</td>-->
<!-- &lt;!&ndash; 面料&ndash;&gt;-->
<!-- <td><span>面料编号</span>2</td>-->
<!-- <td><span>面料名称</span>2A01</td>-->
<!-- </tr>-->
<!-- <tr>-->
<!-- <td><span>面料创建时间</span>2022-12-06 10:02:59</td>-->
<!-- &lt;!&ndash; 辅料&ndash;&gt;-->
<!-- <td><span>辅料名称</span>2A01</td>-->
<!-- <td><span>辅料创建时间</span>2022-12-06 10:02:59</td>-->
<!-- &lt;!&ndash; 工序&ndash;&gt;-->
<!-- <td><span>工序名称</span>2A01</td>-->
<!-- </tr>-->
<!-- <tr>-->
<!-- <td><span>工序创建时间</span>2022-12-06 10:02:59</td>-->
<!-- <table border="1" style="width: 98%;font-size:14px;margin:30px auto 0" class="table">-->
<!-- <tr>-->
<!-- <td><span>款式名称</span>tttt</td>-->
<!-- <td><span>款式编号</span>QIYE80301100000130</td>-->
<!-- <td><span>款式规格</span>123</td>-->
<!-- <td><span>款式形式</span>预制</td>-->
<!-- </tr>-->
<!-- <tr>-->
<!-- <td><span>企业</span>黄淮服装智能制造中心</td>-->
<!-- <td><span>款式创建时间</span>2022-12-06 10:02:59</td>-->
<!-- &lt;!&ndash; 模块&ndash;&gt;-->
<!-- <td><span>服装类型</span>tttt</td>-->
<!-- <td><span>模块编号</span>QIYE80301100000130</td>-->
<!-- </tr>-->
<!-- <tr>-->
<!-- <td><span>模块名称</span>2</td>-->
<!-- <td><span>模块创建时间</span>2022-12-06 10:02:59</td>-->
<!-- &lt;!&ndash; 面料&ndash;&gt;-->
<!-- <td><span>面料编号</span>2</td>-->
<!-- <td><span>面料名称</span>2A01</td>-->
<!-- </tr>-->
<!-- <tr>-->
<!-- <td><span>面料创建时间</span>2022-12-06 10:02:59</td>-->
<!-- &lt;!&ndash; 辅料&ndash;&gt;-->
<!-- <td><span>辅料名称</span>2A01</td>-->
<!-- <td><span>辅料创建时间</span>2022-12-06 10:02:59</td>-->
<!-- &lt;!&ndash; 工序&ndash;&gt;-->
<!-- <td><span>工序名称</span>2A01</td>-->
<!-- </tr>-->
<!-- <tr>-->
<!-- <td><span>工序创建时间</span>2022-12-06 10:02:59</td>-->
<!-- <td><span>面料编号</span>2</td>-->
<!-- <td><span>面料名称</span>2A01</td>-->
<!-- <td><span>面料名称</span>2A01</td>-->
<!-- </tr>-->
<!-- <td><span>面料编号</span>2</td>-->
<!-- <td><span>面料名称</span>2A01</td>-->
<!-- <td><span>面料名称</span>2A01</td>-->
<!-- </tr>-->
<!-- </table>-->
<!-- </table>-->
<a-spin :spinning="confirmLoading">
<h3 style="width: 98%;;margin:0px auto">款式详情</h3>
<a-table style="width: 98%;font-size:14px;margin:10px auto" :columns="columns1" :data-source="data1" bordered rowKey="nums" :pagination="false">
</a-table>
<h3 style="width: 98%;;margin:0px auto">款式详情</h3>
<a-table style="width: 98%;font-size:14px;margin:10px auto" :columns="columns1" :data-source="data1" bordered
rowKey="nums" :pagination="false">
</a-table>
<h3 style="width: 98%;;margin:20px auto 0">管理模块</h3>
<a-table style="width: 98%;font-size:14px;margin:10px auto 0" :columns="columns" :data-source="data" rowKey="id" bordered :pagination="false">
</a-table>
<h3 style="width: 98%;;margin:20px auto 0">管理模块</h3>
<a-table style="width: 98%;font-size:14px;margin:10px auto 0" :columns="columns" :data-source="data" rowKey="id"
bordered :pagination="false">
</a-table>
<h3 style="width: 98%;;margin:20px auto 0">管理面料</h3>
<a-table style="width: 98%;font-size:14px;margin:10px auto 0" :columns="columns2" :data-source="data2" rowKey="id" bordered :pagination="false">
<h3 style="width: 98%;;margin:20px auto 0">管理面料</h3>
<a-table style="width: 98%;font-size:14px;margin:10px auto 0" :columns="columns2" :data-source="data2"
rowKey="id" bordered :pagination="false">
</a-table>
</a-table>
<h3 style="width: 98%;;margin:20px auto 0">管理辅料</h3>
<a-table style="width: 98%;font-size:14px;margin:10px auto 0" :columns="columns3" :data-source="data3" rowKey="id" bordered :pagination="false">
<h3 style="width: 98%;;margin:20px auto 0">管理辅料</h3>
<a-table style="width: 98%;font-size:14px;margin:10px auto 0" :columns="columns3" :data-source="data3"
rowKey="id" bordered :pagination="false">
</a-table>
</a-table>
<h3 style="width: 98%;;margin:20px auto 0">管理型号</h3>
<!-- <a-table style="width: 98%;font-size:14px;margin:10px auto 0" :columns="columns4" :data-source="data4" bordered :pagination="false">-->
<h3 style="width: 98%;;margin:20px auto 0">管理型号</h3>
<a-table style="width: 98%;font-size:14px;margin:10px auto 0" :columns="columns4" :data-source="data4" rowKey="id" bordered :pagination="false">
<!-- </a-table>-->
</a-table>
<h3 style="width: 98%;;margin:20px auto 0">管理工序</h3>
<a-table style="width: 98%;font-size:14px;margin:10px auto 0" :columns="columns5" :data-source="data5" rowKey="id" bordered :pagination="false">
<h3 style="width: 98%;;margin:20px auto 0">管理工序</h3>
<a-table style="width: 98%;font-size:14px;margin:10px auto 0" :columns="columns5" :data-source="data5"
rowKey="id" bordered :pagination="false" >
</a-table>
</a-table>
</a-spin>
</a-modal>
</div>
</template>
<script>
const columns1 = [
{
title: '款式名称',
dataIndex: 'styleNames',
key: 'styleNames',
align:'center'
},
{
title: '款式编号',
dataIndex: 'nums',
key: 'nums',
align:'center'
},
{
title: '款式规格',
dataIndex: 'specification',
key: 'specification',
align:'center'
},
{
title: '款式形式',
dataIndex: 'shape',
key: 'shape',
align:'center'
},
{
title: '企业',
dataIndex: 'enterpriseId',
key: 'enterpriseId',
align:'center'
},
{
title: '款式创建时间',
dataIndex: 'createTime',
key: 'createTime',
align:'center'
},
];
const columns = [
{
title: '服装类型',
dataIndex: 'typeName',
key: 'typeName',
align:'center'
},
{
title: '款式编号',
dataIndex: 'styleNums',
key: 'styleNums',
align:'center'
},
{
title: '款式名称',
dataIndex: 'styleNames',
key: 'styleNames',
align:'center'
},
{
title: '模块编号',
dataIndex: 'modularNums',
key: 'modularNums',
align:'center'
},
{
title: '模块名称',
dataIndex: 'modularName',
key: 'modularName',
align:'center'
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
align:'center'
}
];
const columns2 = [
{
title: '服装类型',
dataIndex: 'typeName',
key: 'typeName',
align:'center'
},
{
title: '款式编号',
dataIndex: 'styleNums',
key: 'styleNums',
align:'center'
},
{
title: '款式名称',
dataIndex: 'styleNames',
key: 'styleNames',
align:'center'
},
{
title: '面料编号',
dataIndex: 'fabricNumber',
key: 'fabricNumber',
align:'center'
},
{
title: '面料名称',
dataIndex: 'fabricName',
key: 'fabricName',
align:'center'
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
align:'center'
}
];
const columns3 = [
{
title: '服装类型名称',
dataIndex: 'typeName',
key: 'typeName',
align:'center'
},
{
title: '款式名称',
dataIndex: 'styleId',
key: 'styleId',
align:'center'
},
{
title: '辅料名称',
dataIndex: 'accessoriesId',
key: 'accessoriesId',
align:'center'
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
align:'center'
}
];
const columns4 = [
{
title: '服装款式',
dataIndex: 'a',
key: 'a',
align:'center'
},
{
title: '是否默认尺码',
dataIndex: 'c',
key: 'c',
align:'center'
},
{
title: '型号编码',
dataIndex: 'e',
key: 'e',
align:'center'
},
{
title: '码数',
dataIndex: 'f',
key: 'f',
align:'center'
},
{
title: '型',
dataIndex: 'a',
key: 'a',
align:'center'
},
{
title: '号',
dataIndex: 'a',
key: 'a',
align:'center'
},
{
title: '领大',
dataIndex: 'c',
key: 'c',
align:'center'
},
{
title: '胸围',
dataIndex: 'e',
key: 'e',
align:'center'
},
{
title: '袖长',
dataIndex: 'f',
key: 'f',
align:'center'
},
{
title: '连肩袖长',
dataIndex: 'e',
key: 'e',
align:'center'
},
{
title: '总肩宽',
dataIndex: 'f',
key: 'f',
align:'center'
},
{
title: '袖口',
dataIndex: 'f',
key: 'f',
align:'center'
},
{
title: '腰围',
dataIndex: 'f',
key: 'f',
align:'center'
},
{
title: '下摆',
dataIndex: 'f',
key: 'f',
align:'center'
}
];
const data4 = [
{
key: '1',
a:'女衬衫',
c:'test010',
e:'123',
f:'2022-12-06 10:02:59',
}
];
const columns5 = [
{
title: '款式名称',
dataIndex: 'styleId',
key: 'styleId',
align:'center'
},
{
title: '工序',
dataIndex: 'processId',
key: 'processId',
align:'center'
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
align:'center'
const columns1 = [
{
title: '款式名称',
dataIndex: 'styleNames',
key: 'styleNames',
align: 'center'
},
{
title: '款式编号',
dataIndex: 'nums',
key: 'nums',
align: 'center'
},
{
title: '款式规格',
dataIndex: 'specification',
key: 'specification',
align: 'center'
},
{
title: '款式形式',
dataIndex: 'shape',
key: 'shape',
align: 'center'
},
{
title: '企业',
dataIndex: 'enterpriseId',
key: 'enterpriseId',
align: 'center'
},
{
title: '款式创建时间',
dataIndex: 'createTime',
key: 'createTime',
align: 'center'
}
];
const columns = [
{
title: '服装类型',
dataIndex: 'typeName',
key: 'typeName',
align: 'center'
},
{
title: '款式编号',
dataIndex: 'styleNums',
key: 'styleNums',
align: 'center'
},
{
title: '款式名称',
dataIndex: 'styleNames',
key: 'styleNames',
align: 'center'
},
{
title: '模块编号',
dataIndex: 'modularNums',
key: 'modularNums',
align: 'center'
},
{
title: '模块名称',
dataIndex: 'modularName',
key: 'modularName',
align: 'center'
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
align: 'center'
}
];
const columns2 = [
{
title: '服装类型',
dataIndex: 'typeName',
key: 'typeName',
align: 'center'
},
{
title: '款式编号',
dataIndex: 'styleNums',
key: 'styleNums',
align: 'center'
},
{
title: '款式名称',
dataIndex: 'styleNames',
key: 'styleNames',
align: 'center'
},
{
title: '面料编号',
dataIndex: 'fabricNumber',
key: 'fabricNumber',
align: 'center'
},
{
title: '面料名称',
dataIndex: 'fabricName',
key: 'fabricName',
align: 'center'
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
align: 'center'
}
];
const columns3 = [
{
title: '服装类型名称',
dataIndex: 'typeName',
key: 'typeName',
align: 'center'
},
{
title: '款式名称',
dataIndex: 'styleId',
key: 'styleId',
align: 'center'
},
{
title: '辅料名称',
dataIndex: 'accessoriesId',
key: 'accessoriesId',
align: 'center'
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
align: 'center'
}
];
const columns4 = [
{
title: '服装款式',
dataIndex: 'styleId',
key: 'styleId',
align: 'center'
},
{
title: '是否默认尺码',
dataIndex: 'isDefaultSize',
key: 'isDefaultSize',
align: 'center'
},
{
title: '型号编码',
dataIndex: 'modelNumber',
key: 'modelNumber',
align: 'center'
},
{
title: '码数',
dataIndex: 'size',
key: 'size',
align: 'center'
},
{
title: '型',
dataIndex: 'anumbers',
key: 'anumbers',
align: 'center'
},
{
title: '号',
dataIndex: 'bnumbers',
key: 'bnumbers',
align: 'center'
},
{
title: '领大',
dataIndex: 'collarLarge',
key: 'collarLarge',
align: 'center'
},
{
title: '胸围',
dataIndex: 'bust',
key: 'bust',
align: 'center'
},
{
title: '袖长',
dataIndex: 'sleeveLength',
key: 'sleeveLength',
align: 'center'
},
{
title: '连肩袖长',
dataIndex: 'shslLength',
key: 'shslLength',
align: 'center'
},
{
title: '总肩宽',
dataIndex: 'tsWidth',
key: 'tsWidth',
align: 'center'
},
{
title: '袖口',
dataIndex: 'cuff',
key: 'cuff',
align: 'center'
},
{
title: '腰围',
dataIndex: 'waistline',
key: 'waistline',
align: 'center'
},
{
title: '下摆',
dataIndex: 'hem',
key: 'hem',
align: 'center'
}
];
const columns5 = [
{
title: '款式名称',
dataIndex: 'styleId',
key: 'styleId',
align: 'center'
},
{
title: '工序',
dataIndex: 'processId',
key: 'processId',
align: 'center'
},
{
title: '创建时间',
dataIndex: 'createTime',
key: 'createTime',
align: 'center'
}
];
export default {
name: 'ZyClothsStyleListDetail',//
data() {
return {
visible: false,
model: {},
confirmLoading: true,
//
data: [],
columns,
//
data1: [],
columns1,
//
data2: [],
columns2,
//
data3: [],
columns3,
//
columns4,
data4:[],
//
columns5,
data5: [],
url: {
detail: "/zyclothsstyle/zyClothsStyle/detail",
},
id: '',
}
];
export default {
name: 'ZyClothsStyleListDetail',//
data () {
return {
visible: false,
model:{
},
confirmLoading:true,
//
data:[],
columns,
//
data1:[],
columns1,
//
data2:[],
columns2,
//
data3:[],
columns3,
//
columns4,
data4,
//
columns5,
data5:[],
url: {
detail: "/zyclothsstyle/zyClothsStyle/detail",
},
id:'',
},
methods: {
showModal(id) {
this.visible = true;
this.id = id
// this.$http.get('/zyclothsstyle/zyClothsStyle/detail?id='+record.id).then(
// res=>{
// console.log('res')
// console.log(res.result.zyClothsStyle)
// this.data1.push(res.result.zyClothsStyle)
// }
// )
this.getDetailData()
},
async getDetailData() {
const {data: res} = await this.$axios.get('/jeecg-boot/zyclothsstyle/zyClothsStyle/detail?id=' + this.id)
if (res.code !== 200) {
this.$message({
type: 'error',
message: '未查询到数据!'
});
}
},
methods: {
showModal(id) {
this.visible = true;
this.id = id
// this.$http.get('/zyclothsstyle/zyClothsStyle/detail?id='+record.id).then(
// res=>{
// console.log('res')
// console.log(res.result.zyClothsStyle)
// this.data1.push(res.result.zyClothsStyle)
// }
// )
this.getDetailData()
},
async getDetailData(){
const {data:res} = await this.$axios.get('/jeecg-boot/zyclothsstyle/zyClothsStyle/detail?id='+this.id)
if (res.code !== 200) {
this.$message({
type: 'error',
message: '未查询到数据!'
});
}
this.confirmLoading = false
if(this.data1.length == 0){
this.data1.push(res.result.zyClothsStyle)
}
this.data2 = res.result.zyStyleFabricList
this.data3 = res.result.zyStyleAccessoriesList
this.data = res.result.zyStyleModuleList
this.data5 = res.result.zyStyleModularList
},
handleOk(e) {
this.confirmLoading = true;
setTimeout(() => {
this.visible = false;
this.confirmLoading = false;
}, 1);
},
handleCancel(e) {
console.log('res.result')
console.log(res.result)
this.confirmLoading = false
if (this.data1.length === 0) {
this.data1.push(res.result.zyClothsStyles)
}
this.data1 = res.result.zyClothsStyles
this.data2 = res.result.zyStyleFabricList
this.data3 = res.result.zyStyleAccessoriesList
this.data4 = res.result.zyStyleModels
this.data = res.result.zyStyleModuleList
this.data5 = res.result.zyStyleModularList
},
handleOk(e) {
this.confirmLoading = true;
setTimeout(() => {
this.visible = false;
},
this.confirmLoading = false;
}, 1);
},
}
</script >
handleCancel(e) {
this.visible = false;
},
},
}
</script>
<style scoped>
.table{border-color:#d9d9d9;border-radius: 3px}
.table td{padding: 10px 20px;max-width: 380px; }
.table td span{color: #333}
.table {
border-color: #d9d9d9;
border-radius: 3px
}
.table td {
padding: 10px 20px;
max-width: 380px;
}
.table td span {
color: #333
}
</style>

@ -3,6 +3,7 @@ package org.jeecg.modules.demo.zyStyleModular.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.jeecg.modules.demo.zyStyleModular.entity.ZyStyleModular;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@ -16,4 +17,12 @@ public interface ZyStyleModularMapper extends BaseMapper<ZyStyleModular> {
List<ZyStyleModular> selectListByStyleId(String styleId);
/**根据styleId 拿到 款式名称*/
@Select("select style_names from zy_cloths_style where id = #{styleId}")
String getStyleNameByStyleId(String styleId);
/**根据工序id 拿到 工序名称*/
@Select("select process_name from zy_process where id = #{processId}")
String getProcessNameByStyleId(String processId);
}

@ -13,7 +13,7 @@ import java.util.List;
/**
* @Description: 款式工序表
* @Author: jeecg-boot
* @Date: 2022-11-14
* @Date: 2022-11-14
* @Version: V1.0
*/
@Service
@ -25,6 +25,12 @@ public class ZyStyleModularServiceImpl extends ServiceImpl<ZyStyleModularMapper,
@Override
public List<ZyStyleModular> detail(String id) {
List<ZyStyleModular> list = zyStyleModularMapper.selectListByStyleId(id);
for (ZyStyleModular zy : list) {
String styleName = zyStyleModularMapper.getStyleNameByStyleId(zy.getStyleId());
zy.setStyleId(styleName);
String processName = zyStyleModularMapper.getProcessNameByStyleId(zy.getProcessId());
zy.setProcessId(processName);
}
return list;
}
}

@ -92,6 +92,10 @@ public class ZyClothsComponentServiceImpl extends ServiceImpl<ZyClothsComponentM
}
String name = containChinese(zyClothsComponent.getEnterpriseId());
zyClothsComponent.setEnterpriseId(name);
String modularName = zyClothsModularMapper.getModularNameByModularId(zyClothsComponent.getModularId());
if (StringUtils.hasText(modularName)) {
zyClothsComponent.setModularId(modularName);
}
return zyClothsComponent;
}

@ -4,12 +4,14 @@ import org.jeecg.modules.demo.base.entity.ZyClothsComponent;
import org.jeecg.modules.demo.base.entity.ZyClothsModularCompent;
import org.jeecg.modules.demo.base.mapper.ZyClothsComponentMapper;
import org.jeecg.modules.demo.base.mapper.ZyClothsModularCompentMapper;
import org.jeecg.modules.demo.base.mapper.ZyClothsModularMapper;
import org.jeecg.modules.demo.base.service.IZyClothsComponentService;
import org.jeecg.modules.demo.base.service.IZyClothsModularCompentService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.util.List;
@ -31,6 +33,8 @@ public class ZyClothsModularCompentServiceImpl extends ServiceImpl<ZyClothsModul
private ZyClothsComponentMapper zyClothsComponentMapper;
@Resource
private ZyClothsModularCompentMapper zyClothsModularCompentMapper;
@Resource
private ZyClothsModularMapper zyClothsModularMapper;
/**
* 把部件信息查出来 赋给模块部件表
* @param componentId 部件id
@ -57,6 +61,10 @@ public class ZyClothsModularCompentServiceImpl extends ServiceImpl<ZyClothsModul
ZyClothsComponent byId = zyClothsComponentService.getById(partsName);
s.setPartsName(byId.getPartsName());
}
if (StringUtils.hasText(s.getModularId())){
String modularName = zyClothsModularMapper.getModularNameByModularId(s.getModularId());
s.setModularId(modularName);
}
}
return zyClothsModularComponents;
}

@ -47,7 +47,6 @@ public class ZyClothsTypeServiceImpl extends ServiceImpl<ZyClothsTypeMapper, ZyC
* */
@Override
public String sort() {
return zyClothsTypeMapper.sort();
}

@ -46,6 +46,13 @@ public class ZyProcessComponentServiceImpl extends ServiceImpl<ZyProcessComponen
}else{
processComponent.setComponentId("null");
}
if (processComponent.getBottleneck().equals("1")){
processComponent.setBottleneck("是");
}else if (processComponent.getBottleneck().equals("2")){
processComponent.setBottleneck("否");
}else {
processComponent.setBottleneck(null);
}
}
return zyProcessComponents;
}

@ -9,8 +9,11 @@ import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.demo.customercollectgoods.entity.Customercollectgoods;
import org.jeecg.modules.demo.customercollectgoods.service.ICustomercollectgoodsService;
@ -71,6 +74,35 @@ public class CustomercollectgoodsController extends JeecgController<Customercoll
IPage<Customercollectgoods> pageList = customercollectgoodsService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 分页列表查询
*
* @param customercollectgoods
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "收藏商品(衣橱)-分页列表查询")
@ApiOperation(value="收藏商品(衣橱)-分页列表查询", notes="收藏商品(衣橱)-分页列表查询")
@GetMapping(value = "/listcustom")
public Result<?> listcustom(Customercollectgoods customercollectgoods,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
QueryWrapper<Customercollectgoods> queryWrapper = QueryGenerator.initQueryWrapper(customercollectgoods, req.getParameterMap());
queryWrapper.eq("createBy",sysUser.getUsername());
Page<Customercollectgoods> page = new Page<Customercollectgoods>(pageNo, pageSize);
IPage<Customercollectgoods> pageList = customercollectgoodsService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加

@ -59,8 +59,9 @@ public class Customercollectgoods implements Serializable {
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
@ApiModelProperty(value = "用户")
private java.lang.String userId;
/**商品*/
@Excel(name = "商品", width = 15)
/**商品*/
@Excel(name = "商品", width = 15, dictTable = "zy_goods", dicText = "goods_name", dicCode = "id")
@Dict(dictTable = "zy_goods", dicText = "goods_name", dicCode = "id")
@ApiModelProperty(value = "商品")
private java.lang.String goodsId;
/**当前单价*/

@ -9,11 +9,8 @@ import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.demo.customerinvoice.entity.CustomerInvoice;
import org.jeecg.modules.demo.customerinvoice.service.ICustomerInvoiceService;
@ -23,6 +20,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.demo.customerinvoice.utils.UnifiedCreditCodeUtil;
import org.jeecg.modules.demo.customerpayment.utils.BankUtil;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@ -42,7 +41,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 客户发票信息
* @Author: jeecg-boot
* @Date: 2022-12-08
* @Date: 2022-12-22
* @Version: V1.0
*/
@Api(tags="客户发票信息")
@ -52,7 +51,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
public class CustomerInvoiceController extends JeecgController<CustomerInvoice, ICustomerInvoiceService> {
@Autowired
private ICustomerInvoiceService customerInvoiceService;
/**
* 分页列表查询
*
@ -74,35 +73,7 @@ public class CustomerInvoiceController extends JeecgController<CustomerInvoice,
IPage<CustomerInvoice> pageList = customerInvoiceService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 分页列表查询
*
* @param customerInvoice
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "客户发票信息-分页列表查询")
@ApiOperation(value="客户发票信息-分页列表查询", notes="客户发票信息-分页列表查询")
@GetMapping(value = "/listcustom")
public Result<?> listcustom(CustomerInvoice customerInvoice,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
QueryWrapper<CustomerInvoice> queryWrapper = QueryGenerator.initQueryWrapper(customerInvoice, req.getParameterMap());
queryWrapper.eq("createBy",sysUser.getUsername());
Page<CustomerInvoice> page = new Page<CustomerInvoice>(pageNo, pageSize);
IPage<CustomerInvoice> pageList = customerInvoiceService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
@ -113,10 +84,43 @@ public class CustomerInvoiceController extends JeecgController<CustomerInvoice,
@ApiOperation(value="客户发票信息-添加", notes="客户发票信息-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody CustomerInvoice customerInvoice) {
customerInvoiceService.save(customerInvoice);
return Result.OK("添加成功!");
}
int flag=0;
UnifiedCreditCodeUtil unifiedCreditCodeUtil = new UnifiedCreditCodeUtil();
BankUtil bankUtil = new BankUtil();
if (UnifiedCreditCodeUtil.checkUnifiedCreditCode(customerInvoice.getTaxIdentificationNumber())){
}else {
flag=1;
return Result.error("请输入正确纳税人识别号");
}
if (bankUtil.checkBankCard(customerInvoice.getAccountNumber())){
customerInvoice.setBankDeposit(bankUtil.getNameOfBank(customerInvoice.getAccountNumber()));
}else{
flag=1;
return Result.error("请输入正确银行卡号码");
}
if(customerInvoice.getSort()>0){
}else{
flag=1;
return Result.error("排序必须大于0");
}
if(flag==0){
customerInvoiceService.save(customerInvoice);
return Result.OK("添加成功!");
}else{
return Result.error("请检查后保存");
}
}
/**
* 编辑
*
@ -127,10 +131,43 @@ public class CustomerInvoiceController extends JeecgController<CustomerInvoice,
@ApiOperation(value="客户发票信息-编辑", notes="客户发票信息-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@RequestBody CustomerInvoice customerInvoice) {
customerInvoiceService.updateById(customerInvoice);
return Result.OK("编辑成功!");
}
int flag=0;
UnifiedCreditCodeUtil unifiedCreditCodeUtil = new UnifiedCreditCodeUtil();
BankUtil bankUtil = new BankUtil();
if (UnifiedCreditCodeUtil.checkUnifiedCreditCode(customerInvoice.getTaxIdentificationNumber())){
}else {
flag=1;
return Result.error("请输入正确纳税人识别号");
}
if (bankUtil.checkBankCard(customerInvoice.getAccountNumber())){
customerInvoice.setBankDeposit(bankUtil.getNameOfBank(customerInvoice.getAccountNumber()));
}else{
flag=1;
return Result.error("请输入正确银行卡号码");
}
if(customerInvoice.getSort()>0){
}else{
flag=1;
return Result.error("排序必须大于0");
}
if(flag==0){
customerInvoiceService.updateById(customerInvoice);
return Result.OK("编辑成功!");
}else{
return Result.error("请检查后保存");
}
}
/**
* 通过id删除
*
@ -144,7 +181,7 @@ public class CustomerInvoiceController extends JeecgController<CustomerInvoice,
customerInvoiceService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
@ -158,7 +195,7 @@ public class CustomerInvoiceController extends JeecgController<CustomerInvoice,
this.customerInvoiceService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*
@ -199,4 +236,8 @@ public class CustomerInvoiceController extends JeecgController<CustomerInvoice,
return super.importExcel(request, response, CustomerInvoice.class);
}
}
}

@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
/**
* @Description: 客户发票信息
* @Author: jeecg-boot
* @Date: 2022-12-08
* @Date: 2022-12-22
* @Version: V1.0
*/
@Data
@ -55,10 +55,14 @@ public class CustomerInvoice implements Serializable {
@ApiModelProperty(value = "所属部门")
private java.lang.String sysOrgCode;
/**用户*/
@Excel(name = "用户", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
@Excel(name = "用户", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "id")
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
@ApiModelProperty(value = "用户")
private java.lang.String userId;
/**用户*/
@Excel(name = "用户", width = 15)
@ApiModelProperty(value = "用户")
private java.lang.String username;
/**客户类型*/
@Excel(name = "客户类型", width = 15, dicCode = "khlx")
@Dict(dicCode = "khlx")
@ -69,9 +73,9 @@ public class CustomerInvoice implements Serializable {
@Dict(dicCode = "fplx")
@ApiModelProperty(value = "发票类型")
private java.lang.String invoiceType;
/**名称*/
@Excel(name = "名称", width = 15)
@ApiModelProperty(value = "名称")
/**名称/姓名*/
@Excel(name = "名称/姓名", width = 15)
@ApiModelProperty(value = "名称/姓名")
private java.lang.String name;
/**纳税人识别号*/
@Excel(name = "纳税人识别号", width = 15)

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 客户发票信息
* @Author: jeecg-boot
* @Date: 2022-12-08
* @Date: 2022-12-22
* @Version: V1.0
*/
public interface CustomerInvoiceMapper extends BaseMapper<CustomerInvoice> {

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.demo.customerinvoice.mapper.CustomerInvoiceMapper">
<mapper namespace=".customerinvoice.mapper.CustomerInvoiceMapper">
</mapper>

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 客户发票信息
* @Author: jeecg-boot
* @Date: 2022-12-08
* @Date: 2022-12-22
* @Version: V1.0
*/
public interface ICustomerInvoiceService extends IService<CustomerInvoice> {

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 客户发票信息
* @Author: jeecg-boot
* @Date: 2022-12-08
* @Date: 2022-12-22
* @Version: V1.0
*/
@Service

@ -0,0 +1,62 @@
package org.jeecg.modules.demo.customerinvoice.utils;
import org.apache.commons.lang.StringUtils;
import java.util.Arrays;
import java.util.List;
/**
* @Description统一信用代码的util
* @Author: lcj
* @Date: Created in 2020-06-30 10:42:26
*/
public class UnifiedCreditCodeUtil {
/**
* 最后一位编码
*/
private static final List<String> LAST_CODE = Arrays.asList(
"0", "1", "2", "3", "4", "5", "6", "7", "8", "9",
"A", "B", "C", "D", "E", "F", "G", "H", "J", "K",
"L", "M", "N", "P", "Q", "R", "T", "U", "W", "X", "Y"
);
/**
* 加权因子
*/
private static final Integer[] FACTOR = {1, 3, 9, 27, 19, 26, 16, 17, 20, 29, 25, 13, 8, 24, 10, 30, 28};
public static boolean checkUnifiedCreditCode(String unifiedCreditCode) {
unifiedCreditCode = trim(unifiedCreditCode);
// 校验身份证
if (StringUtils.isBlank(unifiedCreditCode) || unifiedCreditCode.length() != 18) {
return false;
}
final String upperCaseCode = unifiedCreditCode.toUpperCase();
// 统一社会信用代码由18位阿拉伯数字或英文大写字母表示(不包括I,O,Z,S,V以防止和阿拉伯字母混淆)-->V:???关我毛事?
if (upperCaseCode.contains("I") || upperCaseCode.contains("O") || upperCaseCode.contains("Z") || upperCaseCode.contains("S") || upperCaseCode.contains("V")) {
return false;
}
char[] chars = upperCaseCode.toCharArray();
int sumCode = 0;
for (int i = 0; i < 17; i++) {
String code = String.valueOf(chars[i]);
int lastCodeIndex = LAST_CODE.indexOf(code);
Integer factorNum = FACTOR[i];
sumCode += (lastCodeIndex * factorNum);
}
int modCode = 31 - sumCode % 31;
String lastCode = LAST_CODE.get(modCode % 31);
return lastCode.equals(String.valueOf(chars[17]));
}
/**
* 去空格
*
* @param str 处理字符串
* @return 结果字符串
*/
private static String trim(String str) {
return str.replaceAll("\n", "").replace(" ", "").trim();
}
}

@ -1,5 +1,6 @@
package org.jeecg.modules.demo.customermeasure.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@ -9,11 +10,8 @@ import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.demo.customermeasure.entity.CustomerMeasure;
import org.jeecg.modules.demo.customermeasure.service.ICustomerMeasureService;
@ -42,7 +40,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 顾客测体管理
* @Author: jeecg-boot
* @Date: 2022-12-03
* @Date: 2022-12-20
* @Version: V1.0
*/
@Api(tags="顾客测体管理")
@ -52,7 +50,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
public class CustomerMeasureController extends JeecgController<CustomerMeasure, ICustomerMeasureService> {
@Autowired
private ICustomerMeasureService customerMeasureService;
/**
* 分页列表查询
*
@ -74,36 +72,8 @@ public class CustomerMeasureController extends JeecgController<CustomerMeasure,
IPage<CustomerMeasure> pageList = customerMeasureService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 分页列表查询
*
* @param customerMeasure
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "顾客测体管理-分页列表查询")
@ApiOperation(value="顾客测体管理-分页列表查询", notes="顾客测体管理-分页列表查询")
@GetMapping(value = "/listcustom")
public Result<?> listcustom(CustomerMeasure customerMeasure,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
QueryWrapper<CustomerMeasure> queryWrapper = QueryGenerator.initQueryWrapper(customerMeasure, req.getParameterMap());
queryWrapper.eq("createBy",sysUser.getUsername());
Page<CustomerMeasure> page = new Page<CustomerMeasure>(pageNo, pageSize);
IPage<CustomerMeasure> pageList = customerMeasureService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
/**
* 添加
*
* @param customerMeasure
@ -113,10 +83,66 @@ public class CustomerMeasureController extends JeecgController<CustomerMeasure,
@ApiOperation(value="顾客测体管理-添加", notes="顾客测体管理-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody CustomerMeasure customerMeasure) {
customerMeasureService.save(customerMeasure);
return Result.OK("添加成功!");
int flag =0;
if (customerMeasure.getHeight()<0 ) {
flag =1;
return Result.error("身高请输入大于零的数字");
}
if (customerMeasure.getWeight()<0){
flag =1;
return Result.error("体重请输入大于零的数字");
}
if(customerMeasure.getHem()<0){
flag =1;
return Result.error("下摆请输入大于零的数字");
}
if(customerMeasure.getCuff()<0){
flag =1;
return Result.error("袖口请输入大于零的数字");
}
if(customerMeasure.getSleeveLength()<0){
flag =1;
return Result.error("袖长请输入大于零的数字");
}
if(customerMeasure.getBust()<0){
flag =1;
return Result.error("胸围请输入大于零的数字");
}
if(customerMeasure.getTheWaist()<0){
flag =1;
return Result.error("腰围请输入大于零的数字");
}
if(customerMeasure.getShoulderWidth()<0){
flag =1;
return Result.error("肩宽请输入大于零的数字");
}
if(customerMeasure.getForebodyLength()<0){
flag =1;
return Result.error("前身长请输入大于零的数字");
}
if(customerMeasure.getNeck()<0){
flag =1;
return Result.error("领围请输入大于零的数字");
}
if(customerMeasure.getHipline()<0){
flag =1;
return Result.error("臀围请输入大于零的数字");
}
if(customerMeasure.getLength()<0){
flag =1;
return Result.error("衣长请输入大于零的数字");
}
if(customerMeasure.getSternalDistance()<0){
flag =1;
return Result.error("胸距请输入大于零的数字");
}
if (flag==0){
customerMeasureService.save(customerMeasure);
return Result.OK("添加成功!");
}
return Result.OK("");
}
/**
* 编辑
*
@ -127,10 +153,67 @@ public class CustomerMeasureController extends JeecgController<CustomerMeasure,
@ApiOperation(value="顾客测体管理-编辑", notes="顾客测体管理-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@RequestBody CustomerMeasure customerMeasure) {
customerMeasureService.updateById(customerMeasure);
return Result.OK("编辑成功!");
}
int flag =0;
if (customerMeasure.getHeight()<0 ) {
flag =1;
return Result.error("身高请输入大于零的数字");
}
if (customerMeasure.getWeight()<0){
flag =1;
return Result.error("体重请输入大于零的数字");
}
if(customerMeasure.getHem()<0){
flag =1;
return Result.error("下摆请输入大于零的数字");
}
if(customerMeasure.getCuff()<0){
flag =1;
return Result.error("袖口请输入大于零的数字");
}
if(customerMeasure.getSleeveLength()<0){
flag =1;
return Result.error("袖长请输入大于零的数字");
}
if(customerMeasure.getBust()<0){
flag =1;
return Result.error("胸围请输入大于零的数字");
}
if(customerMeasure.getTheWaist()<0){
flag =1;
return Result.error("腰围请输入大于零的数字");
}
if(customerMeasure.getShoulderWidth()<0){
flag =1;
return Result.error("肩宽请输入大于零的数字");
}
if(customerMeasure.getForebodyLength()<0){
flag =1;
return Result.error("前身长请输入大于零的数字");
}
if(customerMeasure.getNeck()<0){
flag =1;
return Result.error("领围请输入大于零的数字");
}
if(customerMeasure.getHipline()<0){
flag =1;
return Result.error("臀围请输入大于零的数字");
}
if(customerMeasure.getLength()<0){
flag =1;
return Result.error("衣长请输入大于零的数字");
}
if(customerMeasure.getSternalDistance()<0){
flag =1;
return Result.error("胸距请输入大于零的数字");
}
if (flag==0){
customerMeasureService.updateById(customerMeasure);
return Result.OK("编辑成功!");
}
return Result.OK("");
}
/**
* 通过id删除
*
@ -144,7 +227,7 @@ public class CustomerMeasureController extends JeecgController<CustomerMeasure,
customerMeasureService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
@ -158,7 +241,7 @@ public class CustomerMeasureController extends JeecgController<CustomerMeasure,
this.customerMeasureService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*

@ -1,5 +1,6 @@
package org.jeecg.modules.demo.customermeasure.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
@ -20,7 +21,7 @@ import lombok.experimental.Accessors;
/**
* @Description: 顾客测体管理
* @Author: jeecg-boot
* @Date: 2022-12-03
* @Date: 2022-12-20
* @Version: V1.0
*/
@Data
@ -55,10 +56,14 @@ public class CustomerMeasure implements Serializable {
@ApiModelProperty(value = "所属部门")
private String sysOrgCode;
/**用户*/
@Excel(name = "用户", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
@Excel(name = "用户", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "id")
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
@ApiModelProperty(value = "用户")
private String userId;
/**用户名*/
@Excel(name = "用户名", width = 15)
@ApiModelProperty(value = "用户名")
private String username;
/**排序*/
@Excel(name = "排序", width = 15)
@ApiModelProperty(value = "排序")

@ -1,15 +1,18 @@
package org.jeecg.modules.demo.customermeasure.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.demo.customermeasure.entity.CustomerMeasure;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.demo.customermeasure.entity.CustomerMeasure;
/**
* @Description: 顾客测体管理
* @Author: jeecg-boot
* @Date: 2022-12-03
* @Date: 2022-12-20
* @Version: V1.0
*/
public interface CustomerMeasureMapper extends BaseMapper<CustomerMeasure> {

@ -1,12 +1,14 @@
package org.jeecg.modules.demo.customermeasure.service;
import org.jeecg.modules.demo.customermeasure.entity.CustomerMeasure;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.demo.customermeasure.entity.CustomerMeasure;
/**
* @Description: 顾客测体管理
* @Author: jeecg-boot
* @Date: 2022-12-03
* @Date: 2022-12-20
* @Version: V1.0
*/
public interface ICustomerMeasureService extends IService<CustomerMeasure> {

@ -1,5 +1,8 @@
package org.jeecg.modules.demo.customermeasure.service.impl;
import org.jeecg.modules.demo.customermeasure.entity.CustomerMeasure;
import org.jeecg.modules.demo.customermeasure.mapper.CustomerMeasureMapper;
import org.jeecg.modules.demo.customermeasure.service.ICustomerMeasureService;
@ -10,7 +13,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 顾客测体管理
* @Author: jeecg-boot
* @Date: 2022-12-03
* @Date: 2022-12-20
* @Version: V1.0
*/
@Service

@ -9,11 +9,8 @@ import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.demo.customerpayment.entity.CustomerPayment;
import org.jeecg.modules.demo.customerpayment.service.ICustomerPaymentService;
@ -23,6 +20,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.demo.customerpayment.utils.BankUtil;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
@ -42,7 +40,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 顾客支付信息管理
* @Author: jeecg-boot
* @Date: 2022-12-03
* @Date: 2022-12-21
* @Version: V1.0
*/
@Api(tags="顾客支付信息管理")
@ -52,7 +50,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
public class CustomerPaymentController extends JeecgController<CustomerPayment, ICustomerPaymentService> {
@Autowired
private ICustomerPaymentService customerPaymentService;
/**
* 分页列表查询
*
@ -74,33 +72,7 @@ public class CustomerPaymentController extends JeecgController<CustomerPayment,
IPage<CustomerPayment> pageList = customerPaymentService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 分页列表查询
*
* @param customerPayment
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "顾客支付信息管理-分页列表查询")
@ApiOperation(value="顾客支付信息管理-分页列表查询", notes="顾客支付信息管理-分页列表查询")
@GetMapping(value = "/listcustom")
public Result<?> listcustom(CustomerPayment customerPayment,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
QueryWrapper<CustomerPayment> queryWrapper = QueryGenerator.initQueryWrapper(customerPayment, req.getParameterMap());
queryWrapper.eq("createBy",sysUser.getUsername());
Page<CustomerPayment> page = new Page<CustomerPayment>(pageNo, pageSize);
IPage<CustomerPayment> pageList = customerPaymentService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
@ -111,10 +83,21 @@ public class CustomerPaymentController extends JeecgController<CustomerPayment,
@ApiOperation(value="顾客支付信息管理-添加", notes="顾客支付信息管理-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody CustomerPayment customerPayment) {
customerPaymentService.save(customerPayment);
return Result.OK("添加成功!");
if(customerPayment.getPaymentType().equals("2")){
BankUtil bankUtil = new BankUtil();
if (bankUtil.checkBankCard(customerPayment.getAccountNo())){
customerPayment.setBankDeposit(bankUtil.getNameOfBank(customerPayment.getAccountNo()));
customerPaymentService.save(customerPayment);
return Result.OK("添加成功!你的银行开是"+bankUtil.getNameOfBank(customerPayment.getAccountNo()));
}else {
return Result.error("请检查银行卡号");
}
}else {
customerPaymentService.save(customerPayment);
return Result.OK("添加成功!");
}
}
/**
* 编辑
*
@ -125,10 +108,22 @@ public class CustomerPaymentController extends JeecgController<CustomerPayment,
@ApiOperation(value="顾客支付信息管理-编辑", notes="顾客支付信息管理-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@RequestBody CustomerPayment customerPayment) {
customerPaymentService.updateById(customerPayment);
return Result.OK("编辑成功!");
}
if(customerPayment.getPaymentType().equals("2")){
BankUtil bankUtil = new BankUtil();
if (bankUtil.checkBankCard(customerPayment.getAccountNo())){
customerPayment.setBankDeposit(bankUtil.getNameOfBank(customerPayment.getAccountNo()));
customerPaymentService.updateById(customerPayment);
return Result.OK("添加成功!你的银行开是"+bankUtil.getNameOfBank(customerPayment.getAccountNo()));
}else {
return Result.error("请检查银行卡号");
}
}else {
customerPaymentService.updateById(customerPayment);
return Result.OK("编辑成功!");
}
}
/**
* 通过id删除
*
@ -142,7 +137,7 @@ public class CustomerPaymentController extends JeecgController<CustomerPayment,
customerPaymentService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
@ -156,7 +151,7 @@ public class CustomerPaymentController extends JeecgController<CustomerPayment,
this.customerPaymentService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*

@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
/**
* @Description: 顾客支付信息管理
* @Author: jeecg-boot
* @Date: 2022-12-03
* @Date: 2022-12-21
* @Version: V1.0
*/
@Data
@ -34,42 +34,46 @@ public class CustomerPayment implements Serializable {
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private String id;
private java.lang.String id;
/**创建人*/
@ApiModelProperty(value = "创建人")
private String createBy;
private java.lang.String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private Date createTime;
private java.util.Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private String updateBy;
private java.lang.String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private Date updateTime;
private java.util.Date updateTime;
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private String sysOrgCode;
private java.lang.String sysOrgCode;
/**用户*/
@Excel(name = "用户", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
@Excel(name = "用户", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "id")
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
@ApiModelProperty(value = "用户")
private String userId;
private java.lang.String userId;
/**用户*/
@Excel(name = "用户", width = 15)
@ApiModelProperty(value = "用户")
private java.lang.String username;
/**支付类型*/
@Excel(name = "支付类型", width = 15, dicCode = "zflx")
@Dict(dicCode = "zflx")
@ApiModelProperty(value = "支付类型")
private String paymentType;
private java.lang.String paymentType;
/**账号/卡号*/
@Excel(name = "账号/卡号", width = 15)
@ApiModelProperty(value = "账号/卡号")
private String accountNo;
private java.lang.String accountNo;
/**开户银行*/
@Excel(name = "开户银行", width = 15)
@ApiModelProperty(value = "开户银行")
private String bankDeposit;
private java.lang.String bankDeposit;
}

@ -3,13 +3,14 @@ package org.jeecg.modules.demo.customerpayment.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.demo.customerpayment.entity.CustomerPayment;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.demo.customerpayment.entity.CustomerPayment;
/**
* @Description: 顾客支付信息管理
* @Author: jeecg-boot
* @Date: 2022-12-03
* @Date: 2022-12-21
* @Version: V1.0
*/
public interface CustomerPaymentMapper extends BaseMapper<CustomerPayment> {

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 顾客支付信息管理
* @Author: jeecg-boot
* @Date: 2022-12-03
* @Date: 2022-12-21
* @Version: V1.0
*/
public interface ICustomerPaymentService extends IService<CustomerPayment> {

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 顾客支付信息管理
* @Author: jeecg-boot
* @Date: 2022-12-03
* @Date: 2022-12-21
* @Version: V1.0
*/
@Service

@ -0,0 +1,416 @@
package org.jeecg.modules.demo.customerpayment.utils;
/**
* 银行卡校验工具类.
*/
public class BankUtil {
/**
* 校验银行卡卡号.
*/
public boolean checkBankCard(String cardId) {
char bit = getBankCardCheckCode(cardId
.substring(0, cardId.length() - 1));
return cardId.charAt(cardId.length() - 1) == bit;
}
/**
* 从不含校验位的银行卡卡号采用 Luhm 校验算法获得校验位
*/
public char getBankCardCheckCode(String nonCheckCodeCardId) {
int cardLenth = nonCheckCodeCardId.trim().length();
if (nonCheckCodeCardId == null || cardLenth == 0 || !nonCheckCodeCardId.matches("\\d+")) {
throw new IllegalArgumentException("请输入有效的银行卡号!");
}
char[] chs = nonCheckCodeCardId.trim().toCharArray();
int luhmSum = 0;
for (int i = chs.length - 1, j = 0; i >= 0; i--, j++) {
int k = chs[i] - '0';
if (j % 2 == 0) {
k *= 2;
k = k / 10 + k % 10;
}
luhmSum += k;
}
return (luhmSum % 10 == 0) ? '0' : (char) ((10 - luhmSum % 10) + '0');
}
/**
* 通过银行卡号获取银行卡所属银行名称
*/
public String getNameOfBank(String idCard) {
int index = -1;
if(idCard==null || idCard.length()<16 || idCard.length()>19){
return "";
}
//6位Bin号
String cardbin_6 = idCard.substring(0, 6);
for (int i = 0; i < bankBin.length; i++) {
if (cardbin_6.equals(bankBin[i])) {
index = i;
}
}
if (index != -1) {
return bankName[index];
}
//8位Bin号
String cardbin_8 = idCard.substring(0, 8);
for (int i = 0; i < bankBin.length; i++) {
if (cardbin_8.equals(bankBin[i])) {
index = i;
}
}
if (index != -1) {
return bankName[index];
}
return "无法识别银行卡所属银行名称";
}
//BIN号
private final static String[] bankBin = {
"621098", "622150", "622151", "622181", "622188", "955100", "621095", "620062", "621285", "621798", "621799",
"621797", "620529", "622199", "621096", "621622", "623219", "621674", "623218", "621599", "370246", "370248",
"370249", "427010", "427018", "427019", "427020", "427029", "427030", "427039", "370247", "438125", "438126",
"451804", "451810", "451811", "458071", "489734", "489735", "489736", "510529", "427062", "524091", "427064",
"530970", "530990", "558360", "620200", "620302", "620402", "620403", "620404", "524047", "620406", "620407",
"525498", "620409", "620410", "620411", "620412", "620502", "620503", "620405", "620408", "620512", "620602",
"620604", "620607", "620611", "620612", "620704", "620706", "620707", "620708", "620709", "620710", "620609",
"620712", "620713", "620714", "620802", "620711", "620904", "620905", "621001", "620902", "621103", "621105",
"621106", "621107", "621102", "621203", "621204", "621205", "621206", "621207", "621208", "621209", "621210",
"621302", "621303", "621202", "621305", "621306", "621307", "621309", "621311", "621313", "621211", "621315",
"621304", "621402", "621404", "621405", "621406", "621407", "621408", "621409", "621410", "621502", "621317",
"621511", "621602", "621603", "621604", "621605", "621608", "621609", "621610", "621611", "621612", "621613",
"621614", "621615", "621616", "621617", "621607", "621606", "621804", "621807", "621813", "621814", "621817",
"621901", "621904", "621905", "621906", "621907", "621908", "621909", "621910", "621911", "621912", "621913",
"621915", "622002", "621903", "622004", "622005", "622006", "622007", "622008", "622010", "622011", "622012",
"621914", "622015", "622016", "622003", "622018", "622019", "622020", "622102", "622103", "622104", "622105",
"622013", "622111", "622114", "622200", "622017", "622202", "622203", "622208", "622210", "622211", "622212",
"622213", "622214", "622110", "622220", "622223", "622225", "622229", "622230", "622231", "622232", "622233",
"622234", "622235", "622237", "622215", "622239", "622240", "622245", "622224", "622303", "622304", "622305",
"622306", "622307", "622308", "622309", "622238", "622314", "622315", "622317", "622302", "622402", "622403",
"622404", "622313", "622504", "622505", "622509", "622513", "622517", "622502", "622604", "622605", "622606",
"622510", "622703", "622715", "622806", "622902", "622903", "622706", "623002", "623006", "623008", "623011",
"623012", "622904", "623015", "623100", "623202", "623301", "623400", "623500", "623602", "623803", "623901",
"623014", "624100", "624200", "624301", "624402", "62451804", "62451810", "62451811", "62458071", "623700",
"628288", "624000", "628286", "622206", "621225", "526836", "513685", "543098", "458441", "620058", "621281",
"622246", "900000", "544210", "548943", "370267", "621558", "621559", "621722", "621723", "620086", "621226",
"402791", "427028", "427038", "548259", "356879", "356880", "356881", "356882", "528856", "621618", "620516",
"621227", "621721", "900010", "625330", "625331", "625332", "623062", "622236", "621670", "524374", "550213",
"374738", "374739", "621288", "625708", "625709", "622597", "622599", "360883", "360884", "625865", "625866",
"625899", "621376", "620054", "620142", "621428", "625939", "621434", "625987", "621761", "621749", "620184",
"621300", "621378", "625114", "622159", "621720", "625021", "625022", "621379", "620114", "620146", "621724",
"625918", "621371", "620143", "620149", "621414", "625914", "621375", "620187", "621433", "625986", "621370",
"625925", "622926", "622927", "622928", "622929", "622930", "622931", "620124", "620183", "620561", "625116",
"622227", "621372", "621464", "625942", "622158", "625917", "621765", "620094", "620186", "621719", "621719",
"621750", "621377", "620148", "620185", "621374", "621731", "621781", "552599", "623206", "621671", "620059",
"403361", "404117", "404118", "404119", "404120", "404121", "463758", "514027", "519412", "519413", "520082",
"520083", "558730", "621282", "621336", "621619", "622821", "622822", "622823", "622824", "622825", "622826",
"622827", "622828", "622836", "622837", "622840", "622841", "622843", "622844", "622845", "622846", "622847",
"622848", "622849", "623018", "625996", "625997", "625998", "628268", "625826", "625827", "548478", "544243",
"622820", "622830", "622838", "625336", "628269", "620501", "621660", "621661", "621662", "621663", "621665",
"621667", "621668", "621669", "621666", "625908", "625910", "625909", "356833", "356835", "409665", "409666",
"409668", "409669", "409670", "409671", "409672", "456351", "512315", "512316", "512411", "512412", "514957",
"409667", "518378", "518379", "518474", "518475", "518476", "438088", "524865", "525745", "525746", "547766",
"552742", "553131", "558868", "514958", "622752", "622753", "622755", "524864", "622757", "622758", "622759",
"622760", "622761", "622762", "622763", "601382", "622756", "628388", "621256", "621212", "620514", "622754",
"622764", "518377", "622765", "622788", "621283", "620061", "621725", "620040", "558869", "621330", "621331",
"621332", "621333", "621297", "377677", "621568", "621569", "625905", "625906", "625907", "628313", "625333",
"628312", "623208", "621620", "621756", "621757", "621758", "621759", "621785", "621786", "621787", "621788",
"621789", "621790", "621672", "625337", "625338", "625568", "621648", "621248", "621249", "622750", "622751",
"622771", "622772", "622770", "625145", "620531", "620210", "620211", "622479", "622480", "622273", "622274",
"621231", "621638", "621334", "625140", "621395", "622725", "622728", "621284", "421349", "434061", "434062",
"436728", "436742", "453242", "491031", "524094", "526410", "544033", "552245", "589970", "620060", "621080",
"621081", "621466", "621467", "621488", "621499", "621598", "621621", "621700", "622280", "622700", "622707",
"622966", "622988", "625955", "625956", "553242", "621082", "621673", "623211", "356896", "356899", "356895",
"436718", "436738", "436745", "436748", "489592", "531693", "532450", "532458", "544887", "552801", "557080",
"558895", "559051", "622166", "622168", "622708", "625964", "625965", "625966", "628266", "628366", "625362",
"625363", "628316", "628317", "620021", "620521", "405512", "601428", "405512", "434910", "458123", "458124",
"520169", "522964", "552853", "601428", "622250", "622251", "521899", "622254", "622255", "622256", "622257",
"622258", "622259", "622253", "622261", "622284", "622656", "628216", "622252", "66405512", "622260", "66601428",
"955590", "955591", "955592", "955593", "628218", "622262", "621069", "620013", "625028", "625029", "621436", "621002",
"621335", "433670", "433680", "442729", "442730", "620082", "622690", "622691", "622692", "622696", "622698", "622998",
"622999", "433671", "968807", "968808", "968809", "621771", "621767", "621768", "621770", "621772", "621773", "620527",
"356837", "356838", "486497", "622660", "622662", "622663", "622664", "622665", "622666", "622667", "622669", "622670",
"622671", "622672", "622668", "622661", "622674", "622673", "620518", "621489", "621492", "620535", "623156", "621490",
"621491", "620085", "623155", "623157", "623158", "623159", "999999", "621222", "623020", "623021", "623022", "623023",
"622630", "622631", "622632", "622633", "622615", "622616", "622618", "622622", "622617", "622619", "415599", "421393",
"421865", "427570", "427571", "472067", "472068", "622620", "621691", "545392", "545393", "545431", "545447", "356859",
"356857", "407405", "421869", "421870", "421871", "512466", "356856", "528948", "552288", "622600", "622601", "622602",
"517636", "622621", "628258", "556610", "622603", "464580", "464581", "523952", "545217", "553161", "356858", "622623",
"625911", "377152", "377153", "377158", "377155", "625912", "625913", "356885", "356886", "356887", "356888", "356890",
"402658", "410062", "439188", "439227", "468203", "479228", "479229", "512425", "521302", "524011", "356889", "545620",
"545621", "545947", "545948", "552534", "552587", "622575", "622576", "622577", "622579", "622580", "545619", "622581",
"622582", "622588", "622598", "622609", "690755", "690755", "545623", "621286", "620520", "621483", "621485", "621486",
"628290", "622578", "370285", "370286", "370287", "370289", "439225", "518710", "518718", "628362", "439226", "628262",
"625802", "625803", "621299", "966666", "622909", "622908", "438588", "438589", "461982", "486493", "486494", "486861",
"523036", "451289", "527414", "528057", "622901", "622902", "622922", "628212", "451290", "524070", "625084", "625085",
"625086", "625087", "548738", "549633", "552398", "625082", "625083", "625960", "625961", "625962", "625963", "356851",
"356852", "404738", "404739", "456418", "498451", "515672", "356850", "517650", "525998", "622177", "622277", "622516",
"622517", "622518", "622520", "622521", "622522", "622523", "628222", "628221", "984301", "984303", "622176", "622276",
"622228", "621352", "621351", "621390", "621792", "625957", "625958", "621791", "620530", "625993", "622519", "621793",
"621795", "621796", "622500", "623078", "622384", "940034", "940015", "622886", "622391", "940072", "622359", "940066",
"622857", "940065", "621019", "622309", "621268", "622884", "621453", "622684", "621016", "621015", "622950", "622951",
"621072", "623183", "623185", "621005", "622172", "622985", "622987", "622267", "622278", "622279", "622468", "622892",
"940021", "621050", "620522", "356827", "356828", "356830", "402673", "402674", "438600", "486466", "519498", "520131",
"524031", "548838", "622148", "622149", "622268", "356829", "622300", "628230", "622269", "625099", "625953", "625350",
"625351", "625352", "519961", "625839", "421317", "602969", "621030", "621420", "621468", "623111", "422160", "422161",
"622865", "940012", "623131", "622178", "622179", "628358", "622394", "940025", "621279", "622281", "622316", "940022",
"621418", "512431", "520194", "621626", "623058", "602907", "622986", "622989", "622298", "622338", "940032", "623205",
"621977", "990027", "622325", "623029", "623105", "621244", "623081", "623108", "566666", "622455", "940039", "622466",
"628285", "622420", "940041", "623118", "603708", "622993", "623070", "623069", "623172", "623173", "622383", "622385",
"628299", "603506", "603367", "622878", "623061", "623209", "628242", "622595", "622303", "622305", "621259", "622596",
"622333", "940050", "621439", "623010", "621751", "628278", "625502", "625503", "625135", "622476", "621754", "622143",
"940001", "623026", "623086", "628291", "621532", "621482", "622135", "622152", "622153", "622154", "622996", "622997",
"940027", "623099", "623007", "940055", "622397", "622398", "940054", "622331", "622426", "625995", "621452", "628205",
"628214", "625529", "622428", "621529", "622429", "621417", "623089", "623200", "940057", "622311", "623119", "622877",
"622879", "621775", "623203", "603601", "622137", "622327", "622340", "622366", "622134", "940018", "623016", "623096",
"940049", "622425", "622425", "621577", "622485", "623098", "628329", "621538", "940006", "621269", "622275", "621216",
"622465", "940031", "621252", "622146", "940061", "621419", "623170", "622440", "940047", "940017", "622418", "623077",
"622413", "940002", "623188", "622310", "940068", "622321", "625001", "622427", "940069", "623039", "628273", "622370",
"683970", "940074", "621437", "628319", "990871", "622308", "621415", "623166", "622132", "621340", "621341", "622140",
"623073", "622147", "621633", "622301", "623171", "621422", "622335", "622336", "622165", "622315", "628295", "625950",
"621760", "622337", "622411", "623102", "622342", "623048", "622367", "622392", "623085", "622395", "622441", "622448",
"621413", "622856", "621037", "621097", "621588", "623032", "622644", "623518", "622870", "622866", "623072", "622897",
"628279", "622864", "621403", "622561", "622562", "622563", "622167", "622777", "621497", "622868", "622899", "628255",
"625988", "622566", "622567", "622625", "622626", "625946", "628200", "621076", "504923", "622173", "622422", "622447",
"622131", "940076", "621579", "622876", "622873", "622962", "622936", "623060", "622937", "623101", "621460", "622939",
"622960", "623523", "621591", "622961", "628210", "622283", "625902", "621010", "622980", "623135", "621726", "621088",
"620517", "622740", "625036", "621014", "621004", "622972", "623196", "621028", "623083", "628250", "623121", "621070",
"628253", "622979", "621035", "621038", "621086", "621498", "621296", "621448", "622945", "621755", "622940", "623120",
"628355", "621089", "623161", "628339", "621074", "621515", "623030", "621345", "621090", "623178", "621091", "623168",
"621057", "623199", "621075", "623037", "628303", "621233", "621235", "621223", "621780", "621221", "623138", "628389",
"621239", "623068", "621271", "628315", "621272", "621738", "621273", "623079", "621263", "621325", "623084", "621327",
"621753", "628331", "623160", "621366", "621388", "621348", "621359", "621360", "621217", "622959", "621270", "622396",
"622511", "623076", "621391", "621339", "621469", "621625", "623688", "623113", "621601", "621655", "621636", "623182",
"623087", "621696", "622955", "622478", "940013", "621495", "621688", "623162", "622462", "628272", "625101", "622323",
"623071", "603694", "622128", "622129", "623035", "623186", "621522", "622271", "940037", "940038", "985262", "622322",
"628381", "622481", "622341", "940058", "623115", "621258", "621465", "621528", "622328", "940062", "625288", "623038",
"625888", "622332", "940063", "623123", "622138", "621066", "621560", "621068", "620088", "621067", "622531", "622329",
"623103", "622339", "620500", "621024", "622289", "622389", "628300", "625516", "621516", "622859", "622869", "623075",
"622895", "623125", "622947", "621561", "623095", "621073", "623109", "621361", "623033", "623207", "622891", "621363",
"623189", "623510", "622995", "621053", "621230", "621229", "622218", "628267", "621392", "621481", "621310", "621396",
"623251", "628351"
};
//"发卡行.卡种名称",
private static final String[] bankName = {
"邮储银行·绿卡通", "邮储银行·绿卡银联标准卡", "邮储银行·绿卡银联标准卡", "邮储银行·绿卡专用卡", "邮储银行·绿卡银联标准卡",
"邮储银行·绿卡(银联卡)", "邮储银行·绿卡VIP卡", "邮储银行·银联标准卡", "邮储银行·中职学生资助卡", "邮政储蓄银行·IC绿卡通VIP卡",
"邮政储蓄银行·IC绿卡通", "邮政储蓄银行·IC联名卡", "邮政储蓄银行·IC预付费卡", "邮储银行·绿卡银联标准卡", "邮储银行·绿卡通",
"邮政储蓄银行·武警军人保障卡", "邮政储蓄银行·中国旅游卡(金卡)", "邮政储蓄银行·普通高中学生资助卡", "邮政储蓄银行·中国旅游卡(普卡)",
"邮政储蓄银行·福农卡", "工商银行·牡丹运通卡金卡", "工商银行·牡丹运通卡金卡", "工商银行·牡丹运通卡金卡", "工商银行·牡丹VISA卡(单位卡)",
"工商银行·牡丹VISA信用卡", "工商银行·牡丹VISA卡(单位卡)", "工商银行·牡丹VISA信用卡", "工商银行·牡丹VISA信用卡", "工商银行·牡丹VISA信用卡",
"工商银行·牡丹VISA信用卡", "工商银行·牡丹运通卡普通卡", "工商银行·牡丹VISA信用卡", "工商银行·牡丹VISA白金卡", "工商银行·牡丹贷记卡(银联卡)",
"工商银行·牡丹贷记卡(银联卡)", "工商银行·牡丹贷记卡(银联卡)", "工商银行·牡丹贷记卡(银联卡)", "工商银行·牡丹欧元卡", "工商银行·牡丹欧元卡",
"工商银行·牡丹欧元卡", "工商银行·牡丹万事达国际借记卡", "工商银行·牡丹VISA信用卡", "工商银行·海航信用卡", "工商银行·牡丹VISA信用卡",
"工商银行·牡丹万事达信用卡", "工商银行·牡丹万事达信用卡", "工商银行·牡丹万事达信用卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡",
"工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹万事达白金卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡",
"工商银行·海航信用卡个人普卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡",
"工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡",
"工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡",
"工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡",
"工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡",
"工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡",
"工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡",
"工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡",
"工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡",
"工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡",
"工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡",
"工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡",
"工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡",
"工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡",
"工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡",
"工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡",
"工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡",
"工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡",
"工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡",
"工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡",
"工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·灵通卡", "工商银行·牡丹灵通卡",
"工商银行·E时代卡", "工商银行·E时代卡", "工商银行·理财金卡", "工商银行·准贷记卡(个普)", "工商银行·准贷记卡(个普)", "工商银行·准贷记卡(个普)",
"工商银行·准贷记卡(个普)", "工商银行·准贷记卡(个普)", "工商银行·牡丹灵通卡", "工商银行·准贷记卡(商普)", "工商银行·牡丹卡(商务卡)",
"工商银行·准贷记卡(商金)", "工商银行·牡丹卡(商务卡)", "工商银行·贷记卡(个普)", "工商银行·牡丹卡(个人卡)", "工商银行·牡丹卡(个人卡)",
"工商银行·牡丹卡(个人卡)", "工商银行·牡丹卡(个人卡)", "工商银行·贷记卡(个金)", "工商银行·牡丹交通卡", "工商银行·准贷记卡(个金)",
"工商银行·牡丹交通卡", "工商银行·贷记卡(商普)", "工商银行·贷记卡(商金)", "工商银行·牡丹卡(商务卡)", "工商银行·牡丹灵通卡",
"工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡",
"工商银行·牡丹交通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡",
"工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡",
"工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡",
"工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡",
"工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡",
"工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡",
"工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡",
"工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹灵通卡", "工商银行·牡丹贷记卡", "工商银行·牡丹贷记卡", "工商银行·牡丹贷记卡",
"工商银行·牡丹贷记卡", "工商银行·牡丹灵通卡", "工商银行·中央预算单位公务卡", "工商银行·牡丹灵通卡", "工商银行·财政预算单位公务卡",
"工商银行·牡丹卡白金卡", "工商银行·牡丹卡普卡", "工商银行·国航知音牡丹信用卡", "工商银行·国航知音牡丹信用卡", "工商银行·国航知音牡丹信用卡",
"工商银行·国航知音牡丹信用卡", "工商银行·银联标准卡", "工商银行·中职学生资助卡", "工商银行·专用信用消费卡", "工商银行·牡丹社会保障卡",
"中国工商银行·牡丹东航联名卡", "中国工商银行·牡丹东航联名卡", "中国工商银行·牡丹运通白金卡", "中国工商银行·福农灵通卡", "中国工商银行·福农灵通卡",
"工商银行·灵通卡", "工商银行·灵通卡", "中国工商银行·中国旅行卡", "工商银行·牡丹卡普卡", "工商银行·国际借记卡", "工商银行·国际借记卡",
"工商银行·国际借记卡", "工商银行·国际借记卡", "中国工商银行·牡丹JCB信用卡", "中国工商银行·牡丹JCB信用卡", "中国工商银行·牡丹JCB信用卡",
"中国工商银行·牡丹JCB信用卡", "中国工商银行·牡丹多币种卡", "中国工商银行·武警军人保障卡", "工商银行·预付芯片卡", "工商银行·理财金账户金卡",
"工商银行·灵通卡", "工商银行·牡丹宁波市民卡", "中国工商银行·中国旅游卡", "中国工商银行·中国旅游卡", "中国工商银行·中国旅游卡", "中国工商银行·借记卡",
"中国工商银行·借贷合一卡", "中国工商银行·普通高中学生资助卡", "中国工商银行·牡丹多币种卡", "中国工商银行·牡丹多币种卡", "中国工商银行·牡丹百夫长信用卡",
"中国工商银行·牡丹百夫长信用卡", "工商银行·工银财富卡", "中国工商银行·中小商户采购卡", "中国工商银行·中小商户采购卡", "中国工商银行·环球旅行金卡",
"中国工商银行·环球旅行白金卡", "中国工商银行·牡丹工银大来卡", "中国工商银行·牡丹工银大莱卡", "中国工商银行·IC金卡", "中国工商银行·IC白金卡",
"中国工商银行·工行IC卡(红卡)", "中国工商银行布鲁塞尔分行·借记卡", "中国工商银行布鲁塞尔分行·预付卡", "中国工商银行布鲁塞尔分行·预付卡",
"中国工商银行金边分行·借记卡", "中国工商银行金边分行·信用卡", "中国工商银行金边分行·借记卡", "中国工商银行金边分行·信用卡", "中国工商银行加拿大分行·借记卡",
"中国工商银行加拿大分行·借记卡", "中国工商银行加拿大分行·预付卡", "中国工商银行巴黎分行·借记卡", "中国工商银行巴黎分行·借记卡", "中国工商银行巴黎分行·贷记卡",
"中国工商银行法兰克福分行·贷记卡", "中国工商银行法兰克福分行·借记卡", "中国工商银行法兰克福分行·贷记卡", "中国工商银行法兰克福分行·贷记卡", "中国工商银行法兰克福分行·借记卡",
"中国工商银行法兰克福分行·预付卡", "中国工商银行法兰克福分行·预付卡", "中国工商银行印尼分行·借记卡", "中国工商银行印尼分行·信用卡", "中国工商银行米兰分行·借记卡",
"中国工商银行米兰分行·预付卡", "中国工商银行米兰分行·预付卡", "中国工商银行阿拉木图子行·借记卡", "中国工商银行阿拉木图子行·贷记卡", "中国工商银行阿拉木图子行·借记卡",
"中国工商银行阿拉木图子行·预付卡", "中国工商银行万象分行·借记卡", "中国工商银行万象分行·贷记卡", "中国工商银行卢森堡分行·借记卡", "中国工商银行卢森堡分行·贷记卡",
"中国工商银行澳门分行·E时代卡", "中国工商银行澳门分行·E时代卡", "中国工商银行澳门分行·E时代卡", "中国工商银行澳门分行·理财金账户", "中国工商银行澳门分行·理财金账户",
"中国工商银行澳门分行·理财金账户", "中国工商银行澳门分行·预付卡", "中国工商银行澳门分行·预付卡", "中国工商银行澳门分行·工银闪付预付卡", "中国工商银行澳门分行·工银银联公司卡",
"中国工商银行澳门分行·Diamond", "中国工商银行阿姆斯特丹·借记卡", "中国工商银行卡拉奇分行·借记卡", "中国工商银行卡拉奇分行·贷记卡", "中国工商银行新加坡分行·贷记卡",
"中国工商银行新加坡分行·贷记卡", "中国工商银行新加坡分行·借记卡", "中国工商银行新加坡分行·预付卡", "中国工商银行新加坡分行·预付卡", "中国工商银行新加坡分行·借记卡",
"中国工商银行新加坡分行·借记卡", "中国工商银行马德里分行·借记卡", "中国工商银行马德里分行·借记卡", "中国工商银行马德里分行·预付卡", "中国工商银行马德里分行·预付卡",
"中国工商银行伦敦子行·借记卡", "中国工商银行伦敦子行·工银伦敦借记卡", "中国工商银行伦敦子行·借记卡", "农业银行·金穗贷记卡", "农业银行·中国旅游卡", "农业银行·普通高中学生资助卡",
"农业银行·银联标准卡", "农业银行·金穗贷记卡(银联卡)", "农业银行·金穗贷记卡(银联卡)", "农业银行·金穗贷记卡(银联卡)", "农业银行·金穗贷记卡(银联卡)", "农业银行·金穗贷记卡(银联卡)",
"农业银行·金穗贷记卡(银联卡)", "农业银行·VISA白金卡", "农业银行·万事达白金卡", "农业银行·金穗贷记卡(银联卡)", "农业银行·金穗贷记卡(银联卡)", "农业银行·金穗贷记卡(银联卡)",
"农业银行·金穗贷记卡(银联卡)", "农业银行·金穗贷记卡", "农业银行·中职学生资助卡", "农业银行·专用惠农卡", "农业银行·武警军人保障卡", "农业银行·金穗校园卡(银联卡)",
"农业银行·金穗星座卡(银联卡)", "农业银行·金穗社保卡(银联卡)", "农业银行·金穗旅游卡(银联卡)", "农业银行·金穗青年卡(银联卡)", "农业银行·复合介质金穗通宝卡",
"农业银行·金穗海通卡", "农业银行·退役金卡", "农业银行·金穗贷记卡", "农业银行·金穗贷记卡", "农业银行·金穗通宝卡(银联卡)", "农业银行·金穗惠农卡", "农业银行·金穗通宝银卡",
"农业银行·金穗通宝卡(银联卡)", "农业银行·金穗通宝卡(银联卡)", "农业银行·金穗通宝卡", "农业银行·金穗通宝卡(银联卡)", "农业银行·金穗通宝卡(银联卡)", "农业银行·金穗通宝钻石卡",
"农业银行·掌尚钱包", "农业银行·银联IC卡金卡", "农业银行·银联预算单位公务卡金卡", "农业银行·银联IC卡白金卡", "农业银行·金穗公务卡", "中国农业银行贷记卡·IC普卡",
"中国农业银行贷记卡·IC金卡", "中国农业银行贷记卡·澳元卡", "中国农业银行贷记卡·欧元卡", "中国农业银行贷记卡·金穗通商卡", "中国农业银行贷记卡·金穗通商卡", "中国农业银行贷记卡·银联白金卡",
"中国农业银行贷记卡·中国旅游卡", "中国农业银行贷记卡·银联IC公务卡", "宁波市农业银行·市民卡B卡", "中国银行·联名卡", "中国银行·个人普卡", "中国银行·个人金卡", "中国银行·员工普卡",
"中国银行·员工金卡", "中国银行·理财普卡", "中国银行·理财金卡", "中国银行·理财银卡", "中国银行·理财白金卡", "中国银行·中行金融IC卡白金卡", "中国银行·中行金融IC卡普卡",
"中国银行·中行金融IC卡金卡", "中国银行·中银JCB卡金卡", "中国银行·中银JCB卡普卡", "中国银行·员工普卡", "中国银行·个人普卡", "中国银行·中银威士信用卡员", "中国银行·中银威士信用卡员",
"中国银行·个人白金卡", "中国银行·中银威士信用卡", "中国银行·长城公务卡", "中国银行·长城电子借记卡", "中国银行·中银万事达信用卡", "中国银行·中银万事达信用卡", "中国银行·中银万事达信用卡",
"中国银行·中银万事达信用卡", "中国银行·中银万事达信用卡", "中国银行·中银威士信用卡员", "中国银行·长城万事达信用卡", "中国银行·长城万事达信用卡", "中国银行·长城万事达信用卡",
"中国银行·长城万事达信用卡", "中国银行·长城万事达信用卡", "中国银行·中银奥运信用卡", "中国银行·长城信用卡", "中国银行·长城信用卡", "中国银行·长城信用卡", "中国银行·长城万事达信用卡",
"中国银行·长城公务卡", "中国银行·长城公务卡", "中国银行·中银万事达信用卡", "中国银行·中银万事达信用卡", "中国银行·长城人民币信用卡", "中国银行·长城人民币信用卡", "中国银行·长城人民币信用卡",
"中国银行·长城信用卡", "中国银行·长城人民币信用卡", "中国银行·长城人民币信用卡", "中国银行·长城信用卡", "中国银行·银联单币贷记卡", "中国银行·长城信用卡", "中国银行·长城信用卡", "中国银行·长城信用卡",
"中国银行·长城电子借记卡", "中国银行·长城人民币信用卡", "中国银行·银联标准公务卡", "中国银行·一卡双账户普卡", "中国银行·财互通卡", "中国银行·电子现金卡", "中国银行·长城人民币信用卡",
"中国银行·长城单位信用卡普卡", "中国银行·中银女性主题信用卡", "中国银行·长城单位信用卡金卡", "中国银行·白金卡", "中国银行·中职学生资助卡", "中国银行·银联标准卡", "中国银行·金融IC卡",
"中国银行·长城社会保障卡", "中国银行·世界卡", "中国银行·社保联名卡", "中国银行·社保联名卡", "中国银行·医保联名卡", "中国银行·医保联名卡", "中国银行·公司借记卡", "中国银行·银联美运顶级卡",
"中国银行·长城福农借记卡金卡", "中国银行·长城福农借记卡普卡", "中国银行·中行金融IC卡普卡", "中国银行·中行金融IC卡金卡", "中国银行·中行金融IC卡白金卡", "中国银行·长城银联公务IC卡白金卡",
"中国银行·中银旅游信用卡", "中国银行·长城银联公务IC卡金卡", "中国银行·中国旅游卡", "中国银行·武警军人保障卡", "中国银行·社保联名借记IC卡", "中国银行·社保联名借记IC卡", "中国银行·医保联名借记IC卡",
"中国银行·医保联名借记IC卡", "中国银行·借记IC个人普卡", "中国银行·借记IC个人金卡", "中国银行·借记IC个人普卡", "中国银行·借记IC白金卡", "中国银行·借记IC钻石卡", "中国银行·借记IC联名卡",
"中国银行·普通高中学生资助卡", "中国银行·长城环球通港澳台旅游金卡", "中国银行·长城环球通港澳台旅游白金卡", "中国银行·中银福农信用卡", "中国银行金边分行·借记卡", "中国银行雅加达分行·借记卡",
"中国银行首尔分行·借记卡", "中国银行澳门分行·人民币信用卡", "中国银行澳门分行·人民币信用卡", "中国银行澳门分行·中银卡", "中国银行澳门分行·中银卡", "中国银行澳门分行·中银卡",
"中国银行澳门分行·中银银联双币商务卡", "中国银行澳门分行·预付卡", "中国银行澳门分行·澳门中国银行银联预付卡", "中国银行澳门分行·澳门中国银行银联预付卡", "中国银行澳门分行·熊猫卡",
"中国银行澳门分行·财富卡", "中国银行澳门分行·银联港币卡", "中国银行澳门分行·银联澳门币卡", "中国银行马尼拉分行·双币种借记卡", "中国银行胡志明分行·借记卡", "中国银行曼谷分行·借记卡",
"中国银行曼谷分行·长城信用卡环球通", "中国银行曼谷分行·借记卡", "建设银行·龙卡准贷记卡", "建设银行·龙卡准贷记卡金卡", "建设银行·中职学生资助卡", "建设银行·乐当家银卡VISA", "建设银行·乐当家金卡VISA",
"建设银行·乐当家白金卡", "建设银行·龙卡普通卡VISA", "建设银行·龙卡储蓄卡", "建设银行·VISA准贷记卡(银联卡)", "建设银行·VISA准贷记金卡", "建设银行·乐当家", "建设银行·乐当家", "建设银行·准贷记金卡",
"建设银行·乐当家白金卡", "建设银行·金融复合IC卡", "建设银行·银联标准卡", "建设银行·银联理财钻石卡", "建设银行·金融IC卡", "建设银行·理财白金卡", "建设银行·社保IC卡", "建设银行·财富卡私人银行卡",
"建设银行·理财金卡", "建设银行·福农卡", "建设银行·武警军人保障卡", "建设银行·龙卡通", "建设银行·银联储蓄卡", "建设银行·龙卡储蓄卡(银联卡)", "建设银行·准贷记卡", "建设银行·理财白金卡", "建设银行·理财金卡",
"建设银行·准贷记卡普卡", "建设银行·准贷记卡金卡", "建设银行·龙卡信用卡", "建设银行·建行陆港通龙卡", "中国建设银行·普通高中学生资助卡", "中国建设银行·中国旅游卡", "中国建设银行·龙卡JCB金卡",
"中国建设银行·龙卡JCB白金卡", "中国建设银行·龙卡JCB普卡", "中国建设银行·龙卡贷记卡公司卡", "中国建设银行·龙卡贷记卡", "中国建设银行·龙卡国际普通卡VISA", "中国建设银行·龙卡国际金卡VISA",
"中国建设银行·VISA白金信用卡", "中国建设银行·龙卡国际白金卡", "中国建设银行·龙卡国际普通卡MASTER", "中国建设银行·龙卡国际金卡MASTER", "中国建设银行·龙卡万事达金卡", "中国建设银行·龙卡贷记卡",
"中国建设银行·龙卡万事达白金卡", "中国建设银行·龙卡贷记卡", "中国建设银行·龙卡万事达信用卡", "中国建设银行·龙卡人民币信用卡", "中国建设银行·龙卡人民币信用金卡", "中国建设银行·龙卡人民币白金卡",
"中国建设银行·龙卡IC信用卡普卡", "中国建设银行·龙卡IC信用卡金卡", "中国建设银行·龙卡IC信用卡白金卡", "中国建设银行·龙卡银联公务卡普卡", "中国建设银行·龙卡银联公务卡金卡", "中国建设银行·中国旅游卡",
"中国建设银行·中国旅游卡", "中国建设银行·龙卡IC公务卡", "中国建设银行·龙卡IC公务卡", "交通银行·交行预付卡", "交通银行·世博预付IC卡", "交通银行·太平洋互连卡", "交通银行·太平洋万事顺卡",
"交通银行·太平洋互连卡(银联卡)", "交通银行·太平洋白金信用卡", "交通银行·太平洋双币贷记卡", "交通银行·太平洋双币贷记卡", "交通银行·太平洋双币贷记卡", "交通银行·太平洋白金信用卡",
"交通银行·太平洋双币贷记卡", "交通银行·太平洋万事顺卡", "交通银行·太平洋人民币贷记卡", "交通银行·太平洋人民币贷记卡", "交通银行·太平洋双币贷记卡", "交通银行·太平洋准贷记卡", "交通银行·太平洋准贷记卡",
"交通银行·太平洋准贷记卡", "交通银行·太平洋准贷记卡", "交通银行·太平洋借记卡", "交通银行·太平洋借记卡", "交通银行·太平洋人民币贷记卡", "交通银行·太平洋借记卡", "交通银行·太平洋MORE卡", "交通银行·白金卡",
"交通银行·交通银行公务卡普卡", "交通银行·太平洋人民币贷记卡", "交通银行·太平洋互连卡", "交通银行·太平洋借记卡", "交通银行·太平洋万事顺卡", "交通银行·太平洋贷记卡(银联卡)", "交通银行·太平洋贷记卡(银联卡)",
"交通银行·太平洋贷记卡(银联卡)", "交通银行·太平洋贷记卡(银联卡)", "交通银行·交通银行公务卡金卡", "交通银行·交银IC卡", "交通银行香港分行·交通银行港币借记卡", "交通银行香港分行·港币礼物卡",
"交通银行香港分行·双币种信用卡", "交通银行香港分行·双币种信用卡", "交通银行香港分行·双币卡", "交通银行香港分行·银联人民币卡", "交通银行澳门分行·银联借记卡", "中信银行·中信借记卡", "中信银行·中信借记卡",
"中信银行·中信国际借记卡", "中信银行·中信国际借记卡", "中信银行·中国旅行卡", "中信银行·中信借记卡(银联卡)", "中信银行·中信借记卡(银联卡)", "中信银行·中信贵宾卡(银联卡)", "中信银行·中信理财宝金卡",
"中信银行·中信理财宝白金卡", "中信银行·中信钻石卡", "中信银行·中信钻石卡", "中信银行·中信借记卡", "中信银行·中信理财宝(银联卡)", "中信银行·中信理财宝(银联卡)", "中信银行·中信理财宝(银联卡)",
"中信银行·借记卡", "中信银行·理财宝IC卡", "中信银行·理财宝IC卡", "中信银行·理财宝IC卡", "中信银行·理财宝IC卡", "中信银行·理财宝IC卡", "中信银行·主账户复合电子现金卡", "光大银行·阳光商旅信用卡",
"光大银行·阳光商旅信用卡", "光大银行·阳光商旅信用卡", "光大银行·阳光卡(银联卡)", "光大银行·阳光卡(银联卡)", "光大银行·阳光卡(银联卡)", "光大银行·阳光卡(银联卡)", "光大银行·阳光卡(银联卡)",
"光大银行·阳光卡(银联卡)", "光大银行·阳光卡(银联卡)", "光大银行·阳光卡(银联卡)", "光大银行·阳光卡(银联卡)", "光大银行·阳光卡(银联卡)", "光大银行·阳光卡(银联卡)", "光大银行·阳光卡(银联卡)",
"光大银行·阳光卡(银联卡)", "光大银行·阳光卡(银联卡)", "光大银行·阳光卡(银联卡)", "光大银行·借记卡普卡", "光大银行·社会保障IC卡", "光大银行·IC借记卡普卡", "光大银行·手机支付卡", "光大银行·联名IC卡普卡",
"光大银行·借记IC卡白金卡", "光大银行·借记IC卡金卡", "光大银行·阳光旅行卡", "光大银行·借记IC卡钻石卡", "光大银行·联名IC卡金卡", "光大银行·联名IC卡白金卡", "光大银行·联名IC卡钻石卡", "华夏银行·华夏卡(银联卡)",
"华夏银行·华夏白金卡", "华夏银行·华夏普卡", "华夏银行·华夏金卡", "华夏银行·华夏白金卡", "华夏银行·华夏钻石卡", "华夏银行·华夏卡(银联卡)", "华夏银行·华夏至尊金卡(银联卡)", "华夏银行·华夏丽人卡(银联卡)",
"华夏银行·华夏万通卡", "民生银行·民生借记卡(银联卡)", "民生银行·民生银联借记卡-金卡", "民生银行·钻石卡", "民生银行·民生借记卡(银联卡)", "民生银行·民生借记卡(银联卡)", "民生银行·民生借记卡(银联卡)",
"民生银行·民生借记卡", "民生银行·民生国际卡", "民生银行·民生国际卡(银卡)", "民生银行·民生国际卡(欧元卡)", "民生银行·民生国际卡(澳元卡)", "民生银行·民生国际卡", "民生银行·民生国际卡", "民生银行·薪资理财卡",
"民生银行·借记卡普卡", "民生银行·民生MasterCard", "民生银行·民生MasterCard", "民生银行·民生MasterCard", "民生银行·民生MasterCard", "民生银行·民生JCB信用卡", "民生银行·民生JCB金卡", "民生银行·民生贷记卡(银联卡)",
"民生银行·民生贷记卡(银联卡)", "民生银行·民生贷记卡(银联卡)", "民生银行·民生贷记卡(银联卡)", "民生银行·民生贷记卡(银联卡)", "民生银行·民生JCB普卡", "民生银行·民生贷记卡(银联卡)", "民生银行·民生贷记卡(银联卡)",
"民生银行·民生信用卡(银联卡)", "民生银行·民生信用卡(银联卡)", "民生银行·民生银联白金信用卡", "民生银行·民生贷记卡(银联卡)", "民生银行·民生银联个人白金卡", "民生银行·公务卡金卡", "民生银行·民生贷记卡(银联卡)",
"民生银行·民生银联商务信用卡", "民生银行·民VISA无限卡", "民生银行·民生VISA商务白金卡", "民生银行·民生万事达钛金卡", "民生银行·民生万事达世界卡", "民生银行·民生万事达白金公务卡", "民生银行·民生JCB白金卡",
"民生银行·银联标准金卡", "民生银行·银联芯片普卡", "民生银行·民生运通双币信用卡普卡", "民生银行·民生运通双币信用卡金卡", "民生银行·民生运通双币信用卡钻石卡", "民生银行·民生运通双币标准信用卡白金卡",
"民生银行·银联芯片金卡", "民生银行·银联芯片白金卡", "招商银行·招商银行信用卡", "招商银行·招商银行信用卡", "招商银行·招商银行信用卡", "招商银行·招商银行信用卡", "招商银行·招商银行信用卡", "招商银行·两地一卡通",
"招商银行·招行国际卡(银联卡)", "招商银行·招商银行信用卡", "招商银行·VISA商务信用卡", "招商银行·招行国际卡(银联卡)", "招商银行·招商银行信用卡", "招商银行·招商银行信用卡", "招商银行·招行国际卡(银联卡)",
"招商银行·世纪金花联名信用卡", "招商银行·招行国际卡(银联卡)", "招商银行·招商银行信用卡", "招商银行·万事达信用卡", "招商银行·万事达信用卡", "招商银行·万事达信用卡", "招商银行·万事达信用卡", "招商银行·招商银行信用卡",
"招商银行·招商银行信用卡", "招商银行·招商银行信用卡", "招商银行·招商银行信用卡", "招商银行·招商银行信用卡", "招商银行·招商银行信用卡", "招商银行·一卡通(银联卡)", "招商银行·万事达信用卡", "招商银行·招商银行信用卡",
"招商银行·招商银行信用卡", "招商银行·一卡通(银联卡)", "招商银行·公司卡(银联卡)", "招商银行·金卡", "招商银行·招行一卡通", "招商银行·招行一卡通", "招商银行·万事达信用卡", "招商银行·金葵花卡", "招商银行·电子现金卡",
"招商银行·银联IC普卡", "招商银行·银联IC金卡", "招商银行·银联金葵花IC卡", "招商银行·IC公务卡", "招商银行·招商银行信用卡", "招商银行信用卡中心·美国运通绿卡", "招商银行信用卡中心·美国运通金卡",
"招商银行信用卡中心·美国运通商务绿卡", "招商银行信用卡中心·美国运通商务金卡", "招商银行信用卡中心·VISA信用卡", "招商银行信用卡中心·MASTER信用卡", "招商银行信用卡中心·MASTER信用金卡",
"招商银行信用卡中心·银联标准公务卡(金卡)", "招商银行信用卡中心·VISA信用卡", "招商银行信用卡中心·银联标准财政公务卡", "招商银行信用卡中心·芯片IC信用卡", "招商银行信用卡中心·芯片IC信用卡",
"招商银行香港分行·香港一卡通", "兴业银行·兴业卡(银联卡)", "兴业银行·兴业卡(银联标准卡)", "兴业银行·兴业自然人生理财卡", "兴业银行·兴业智能卡(银联卡)", "兴业银行·兴业智能卡",
"兴业银行·visa标准双币个人普卡", "兴业银行·VISA商务普卡", "兴业银行·VISA商务金卡", "兴业银行·VISA运动白金信用卡", "兴业银行·万事达信用卡(银联卡)", "兴业银行·VISA信用卡(银联卡)",
"兴业银行·加菲猫信用卡", "兴业银行·个人白金卡", "兴业银行·银联信用卡(银联卡)", "兴业银行·银联信用卡(银联卡)", "兴业银行·银联白金信用卡", "兴业银行·银联标准公务卡", "兴业银行·VISA信用卡(银联卡)",
"兴业银行·万事达信用卡(银联卡)", "兴业银行·银联标准贷记普卡", "兴业银行·银联标准贷记金卡", "兴业银行·银联标准贷记金卡", "兴业银行·银联标准贷记金卡", "兴业银行·兴业信用卡", "兴业银行·兴业信用卡",
"兴业银行·兴业信用卡", "兴业银行·银联标准贷记普卡", "兴业银行·银联标准贷记普卡", "兴业银行·兴业芯片普卡", "兴业银行·兴业芯片金卡", "兴业银行·兴业芯片白金卡", "兴业银行·兴业芯片钻石卡", "浦东发展银行·浦发JCB金卡",
"浦东发展银行·浦发JCB白金卡", "浦东发展银行·信用卡VISA普通", "浦东发展银行·信用卡VISA金卡", "浦东发展银行·浦发银行VISA年青卡", "浦东发展银行·VISA白金信用卡", "浦东发展银行·浦发万事达白金卡", "浦东发展银行·浦发JCB普卡",
"浦东发展银行·浦发万事达金卡", "浦东发展银行·浦发万事达普卡", "浦东发展银行·浦发单币卡", "浦东发展银行·浦发银联单币麦兜普卡", "浦东发展银行·东方轻松理财卡", "浦东发展银行·东方-轻松理财卡普卡", "浦东发展银行·东方轻松理财卡",
"浦东发展银行·东方轻松理财智业金卡", "浦东发展银行·东方卡(银联卡)", "浦东发展银行·东方卡(银联卡)", "浦东发展银行·东方卡(银联卡)", "浦东发展银行·公务卡金卡", "浦东发展银行·公务卡普卡", "浦东发展银行·东方卡",
"浦东发展银行·东方卡", "浦东发展银行·浦发单币卡", "浦东发展银行·浦发联名信用卡", "浦东发展银行·浦发银联白金卡", "浦东发展银行·轻松理财普卡", "浦东发展银行·移动联名卡", "浦东发展银行·轻松理财消贷易卡",
"浦东发展银行·轻松理财普卡(复合卡)", "浦东发展银行·贷记卡", "浦东发展银行·贷记卡", "浦东发展银行·东方借记卡(复合卡)", "浦东发展银行·电子现金卡(IC卡)", "浦东发展银行·移动浦发联名卡",
"浦东发展银行·东方-标准准贷记卡", "浦东发展银行·轻松理财金卡(复合卡)", "浦东发展银行·轻松理财白金卡(复合卡)", "浦东发展银行·轻松理财钻石卡(复合卡)", "浦东发展银行·东方卡", "恒丰银行·九州IC卡",
"恒丰银行·九州借记卡(银联卡)", "恒丰银行·九州借记卡(银联卡)", "天津市商业银行·银联卡(银联卡)", "烟台商业银行·金通卡", "潍坊银行·鸢都卡(银联卡)", "潍坊银行·鸳都卡(银联卡)", "临沂商业银行·沂蒙卡(银联卡)",
"临沂商业银行·沂蒙卡(银联卡)", "日照市商业银行·黄海卡", "日照市商业银行·黄海卡(银联卡)", "浙商银行·商卡", "浙商银行·商卡", "渤海银行·浩瀚金卡", "渤海银行·渤海银行借记卡", "渤海银行·金融IC卡",
"渤海银行·渤海银行公司借记卡", "星展银行·星展银行借记卡", "星展银行·星展银行借记卡", "恒生银行·恒生通财卡", "恒生银行·恒生优越通财卡", "新韩银行·新韩卡", "上海银行·慧通钻石卡", "上海银行·慧通金卡",
"上海银行·私人银行卡", "上海银行·综合保险卡", "上海银行·申卡社保副卡(有折)", "上海银行·申卡社保副卡(无折)", "上海银行·白金IC借记卡", "上海银行·慧通白金卡(配折)", "上海银行·慧通白金卡(不配折)",
"上海银行·申卡(银联卡)", "上海银行·申卡借记卡", "上海银行·银联申卡(银联卡)", "上海银行·单位借记卡", "上海银行·首发纪念版IC卡", "上海银行·申卡贷记卡", "上海银行·申卡贷记卡", "上海银行·J分期付款信用卡",
"上海银行·申卡贷记卡", "上海银行·申卡贷记卡", "上海银行·上海申卡IC", "上海银行·申卡贷记卡", "上海银行·申卡贷记卡普通卡", "上海银行·申卡贷记卡金卡", "上海银行·万事达白金卡", "上海银行·万事达星运卡",
"上海银行·申卡贷记卡金卡", "上海银行·申卡贷记卡普通卡", "上海银行·安融卡", "上海银行·分期付款信用卡", "上海银行·信用卡", "上海银行·个人公务卡", "上海银行·安融卡", "上海银行·上海银行银联白金卡",
"上海银行·贷记IC卡", "上海银行·中国旅游卡(IC普卡)", "上海银行·中国旅游卡(IC金卡)", "上海银行·中国旅游卡(IC白金卡)", "上海银行·万事达钻石卡", "上海银行·淘宝IC普卡", "北京银行·京卡借记卡",
"北京银行·京卡(银联卡)", "北京银行·京卡借记卡", "北京银行·京卡", "北京银行·京卡", "北京银行·借记IC卡", "北京银行·京卡贵宾金卡", "北京银行·京卡贵宾白金卡", "吉林银行·君子兰一卡通(银联卡)",
"吉林银行·君子兰卡(银联卡)", "吉林银行·长白山金融IC卡", "吉林银行·信用卡", "吉林银行·信用卡", "吉林银行·公务卡", "镇江市商业银行·金山灵通卡(银联卡)", "镇江市商业银行·金山灵通卡(银联卡)",
"宁波银行·银联标准卡", "宁波银行·汇通借记卡", "宁波银行·汇通卡(银联卡)", "宁波银行·明州卡", "宁波银行·汇通借记卡", "宁波银行·汇通国际卡银联双币卡", "宁波银行·汇通国际卡银联双币卡",
"平安银行·新磁条借记卡", "平安银行·平安银行IC借记卡", "平安银行·万事顺卡", "平安银行·平安银行借记卡", "平安银行·平安银行借记卡", "平安银行·万事顺借记卡", "焦作市商业银行·月季借记卡(银联卡)",
"焦作市商业银行·月季城市通(银联卡)", "焦作市商业银行·中国旅游卡", "温州银行·金鹿卡", "汉口银行·九通卡(银联卡)", "汉口银行·九通卡", "汉口银行·借记卡", "汉口银行·借记卡", "盛京银行·玫瑰卡",
"盛京银行·玫瑰IC卡", "盛京银行·玫瑰IC卡", "盛京银行·玫瑰卡", "盛京银行·玫瑰卡", "盛京银行·玫瑰卡(银联卡)", "盛京银行·玫瑰卡(银联卡)", "盛京银行·盛京银行公务卡", "洛阳银行·都市一卡通(银联卡)",
"洛阳银行·都市一卡通(银联卡)", "洛阳银行·--", "大连银行·北方明珠卡", "大连银行·人民币借记卡", "大连银行·金融IC借记卡", "大连银行·大连市社会保障卡", "大连银行·借记IC卡", "大连银行·借记IC卡",
"大连银行·大连市商业银行贷记卡", "大连银行·大连市商业银行贷记卡", "大连银行·银联标准公务卡", "苏州市商业银行·姑苏卡", "杭州商业银行·西湖卡", "杭州商业银行·西湖卡", "杭州商业银行·借记IC卡",
"杭州商业银行·", "南京银行·梅花信用卡公务卡", "南京银行·梅花信用卡商务卡", "南京银行·梅花贷记卡(银联卡)", "南京银行·梅花借记卡(银联卡)", "南京银行·白金卡", "南京银行·商务卡", "东莞市商业银行·万顺通卡(银联卡)",
"东莞市商业银行·万顺通卡(银联卡)", "东莞市商业银行·万顺通借记卡", "东莞市商业银行·社会保障卡", "乌鲁木齐市商业银行·雪莲借记IC卡", "乌鲁木齐市商业银行·乌鲁木齐市公务卡", "乌鲁木齐市商业银行·福农卡贷记卡",
"乌鲁木齐市商业银行·福农卡准贷记卡", "乌鲁木齐市商业银行·雪莲准贷记卡", "乌鲁木齐市商业银行·雪莲贷记卡(银联卡)", "乌鲁木齐市商业银行·雪莲借记IC卡", "乌鲁木齐市商业银行·雪莲借记卡(银联卡)",
"乌鲁木齐市商业银行·雪莲卡(银联卡)", "绍兴银行·兰花IC借记卡", "绍兴银行·社保IC借记卡", "绍兴银行·兰花公务卡", "成都商业银行·芙蓉锦程福农卡", "成都商业银行·芙蓉锦程天府通卡", "成都商业银行·锦程卡(银联卡)",
"成都商业银行·锦程卡金卡", "成都商业银行·锦程卡定活一卡通金卡", "成都商业银行·锦程卡定活一卡通", "成都商业银行·锦程力诚联名卡", "成都商业银行·锦程力诚联名卡", "成都商业银行·锦程卡(银联卡)", "抚顺银行·借记IC卡",
"临商银行·借记卡", "宜昌市商业银行·三峡卡(银联卡)", "宜昌市商业银行·信用卡(银联卡)", "葫芦岛市商业银行·一通卡", "葫芦岛市商业银行·一卡通(银联卡)", "天津市商业银行·津卡", "天津市商业银行·津卡贷记卡(银联卡)",
"天津市商业银行·贷记IC卡", "天津市商业银行·--", "天津银行·商务卡", "宁夏银行·宁夏银行公务卡", "宁夏银行·宁夏银行福农贷记卡", "宁夏银行·如意卡(银联卡)", "宁夏银行·宁夏银行福农借记卡", "宁夏银行·如意借记卡",
"宁夏银行·如意IC卡", "宁夏银行·宁夏银行如意借记卡", "宁夏银行·中国旅游卡", "齐商银行·金达卡(银联卡)", "齐商银行·金达借记卡(银联卡)", "齐商银行·金达IC卡", "徽商银行·黄山卡", "徽商银行·黄山卡", "徽商银行·借记卡",
"徽商银行·徽商银行中国旅游卡(安徽)", "徽商银行合肥分行·黄山卡", "徽商银行芜湖分行·黄山卡(银联卡)", "徽商银行马鞍山分行·黄山卡(银联卡)", "徽商银行淮北分行·黄山卡(银联卡)", "徽商银行安庆分行·黄山卡(银联卡)",
"重庆银行·长江卡(银联卡)", "重庆银行·长江卡(银联卡)", "重庆银行·长江卡", "重庆银行·借记IC卡", "哈尔滨银行·丁香一卡通(银联卡)", "哈尔滨银行·丁香借记卡(银联卡)", "哈尔滨银行·丁香卡", "哈尔滨银行·福农借记卡",
"无锡市商业银行·太湖金保卡(银联卡)", "丹东银行·借记IC卡", "丹东银行·丹东银行公务卡", "兰州银行·敦煌卡", "南昌银行·金瑞卡(银联卡)", "南昌银行·南昌银行借记卡", "南昌银行·金瑞卡", "晋商银行·晋龙一卡通",
"晋商银行·晋龙一卡通", "晋商银行·晋龙卡(银联卡)", "青岛银行·金桥通卡", "青岛银行·金桥卡(银联卡)", "青岛银行·金桥卡(银联卡)", "青岛银行·金桥卡", "青岛银行·借记IC卡", "吉林银行·雾凇卡(银联卡)",
"吉林银行·雾凇卡(银联卡)", "南通商业银行·金桥卡(银联卡)", "南通商业银行·金桥卡(银联卡)", "日照银行·黄海卡、财富卡借记卡", "鞍山银行·千山卡(银联卡)", "鞍山银行·千山卡(银联卡)", "鞍山银行·千山卡",
"青海银行·三江银行卡(银联卡)", "青海银行·三江卡", "台州银行·大唐贷记卡", "台州银行·大唐准贷记卡", "台州银行·大唐卡(银联卡)", "台州银行·大唐卡", "台州银行·借记卡", "台州银行·公务卡",
"泉州银行·海峡银联卡(银联卡)", "泉州银行·海峡储蓄卡", "泉州银行·海峡银联卡(银联卡)", "泉州银行·海峡卡", "泉州银行·公务卡", "昆明商业银行·春城卡(银联卡)", "昆明商业银行·春城卡(银联卡)",
"昆明商业银行·富滇IC卡(复合卡)", "阜新银行·借记IC卡", "嘉兴银行·南湖借记卡(银联卡)", "廊坊银行·白金卡", "廊坊银行·金卡", "廊坊银行·银星卡(银联卡)", "廊坊银行·龙凤呈祥卡", "内蒙古银行·百灵卡(银联卡)",
"内蒙古银行·成吉思汗卡", "湖州市商业银行·百合卡", "湖州市商业银行·", "沧州银行·狮城卡", "南宁市商业银行·桂花卡(银联卡)", "包商银行·雄鹰卡(银联卡)", "包商银行·包头市商业银行借记卡", "包商银行·雄鹰贷记卡",
"包商银行·包商银行内蒙古自治区公务卡", "包商银行·贷记卡", "包商银行·借记卡", "连云港市商业银行·金猴神通借记卡", "威海商业银行·通达卡(银联卡)", "威海市商业银行·通达借记IC卡", "攀枝花市商业银行·攀枝花卡(银联卡)",
"攀枝花市商业银行·攀枝花卡", "绵阳市商业银行·科技城卡(银联卡)", "泸州市商业银行·酒城卡(银联卡)", "泸州市商业银行·酒城IC卡", "大同市商业银行·云冈卡(银联卡)", "三门峡银行·天鹅卡(银联卡)", "广东南粤银行·南珠卡(银联卡)",
"张家口市商业银行·好运IC借记卡", "桂林市商业银行·漓江卡(银联卡)", "龙江银行·福农借记卡", "龙江银行·联名借记卡", "龙江银行·福农借记卡", "龙江银行·龙江IC卡", "龙江银行·社会保障卡", "龙江银行·--",
"江苏长江商业银行·长江卡", "徐州市商业银行·彭城借记卡(银联卡)", "南充市商业银行·借记IC卡", "南充市商业银行·熊猫团团卡", "莱商银行·银联标准卡", "莱芜银行·金凤卡", "莱商银行·借记IC卡", "德阳银行·锦程卡定活一卡通",
"德阳银行·锦程卡定活一卡通金卡", "德阳银行·锦程卡定活一卡通", "唐山市商业银行·唐山市城通卡", "曲靖市商业银行·珠江源卡", "曲靖市商业银行·珠江源IC卡", "温州银行·金鹿信用卡", "温州银行·金鹿信用卡",
"温州银行·金鹿公务卡", "温州银行·贷记IC卡", "汉口银行·汉口银行贷记卡", "汉口银行·汉口银行贷记卡", "汉口银行·九通香港旅游贷记普卡", "汉口银行·九通香港旅游贷记金卡", "汉口银行·贷记卡", "汉口银行·九通公务卡",
"江苏银行·聚宝借记卡", "江苏银行·月季卡", "江苏银行·紫金卡", "江苏银行·绿扬卡(银联卡)", "江苏银行·月季卡(银联卡)", "江苏银行·九州借记卡(银联卡)", "江苏银行·月季卡(银联卡)", "江苏银行·聚宝惠民福农卡",
"江苏银行·江苏银行聚宝IC借记卡", "江苏银行·聚宝IC借记卡VIP卡", "长治市商业银行·长治商行银联晋龙卡", "承德市商业银行·热河卡", "承德银行·借记IC卡", "德州银行·长河借记卡", "德州银行·--", "遵义市商业银行·社保卡",
"遵义市商业银行·尊卡", "邯郸市商业银行·邯银卡", "邯郸市商业银行·邯郸银行贵宾IC借记卡", "安顺市商业银行·黄果树福农卡", "安顺市商业银行·黄果树借记卡", "江苏银行·紫金信用卡(公务卡)", "江苏银行·紫金信用卡",
"江苏银行·天翼联名信用卡", "平凉市商业银行·广成卡", "玉溪市商业银行·红塔卡", "玉溪市商业银行·红塔卡", "浙江民泰商业银行·金融IC卡", "浙江民泰商业银行·民泰借记卡", "浙江民泰商业银行·金融IC卡C卡",
"浙江民泰商业银行·银联标准普卡金卡", "浙江民泰商业银行·商惠通", "上饶市商业银行·三清山卡", "东营银行·胜利卡", "泰安市商业银行·岱宗卡", "泰安市商业银行·市民一卡通", "浙江稠州商业银行·义卡",
"浙江稠州商业银行·义卡借记IC卡", "浙江稠州商业银行·公务卡", "自贡市商业银行·借记IC卡", "自贡市商业银行·锦程卡", "鄂尔多斯银行·天骄公务卡", "鹤壁银行·鹤卡", "许昌银行·连城卡", "铁岭银行·龙凤卡",
"乐山市商业银行·大福卡", "乐山市商业银行·--", "长安银行·长长卡", "长安银行·借记IC卡", "重庆三峡银行·财富人生卡", "重庆三峡银行·借记卡", "石嘴山银行·麒麟借记卡", "石嘴山银行·麒麟借记卡",
"石嘴山银行·麒麟公务卡", "盘锦市商业银行·鹤卡", "盘锦市商业银行·盘锦市商业银行鹤卡", "平顶山银行·平顶山银行公务卡", "朝阳银行·鑫鑫通卡", "朝阳银行·朝阳银行福农卡", "朝阳银行·红山卡", "宁波东海银行·绿叶卡",
"遂宁市商业银行·锦程卡", "遂宁是商业银行·金荷卡", "保定银行·直隶卡", "保定银行·直隶卡", "凉山州商业银行·锦程卡", "凉山州商业银行·金凉山卡", "漯河银行·福卡", "漯河银行·福源卡", "漯河银行·福源公务卡",
"达州市商业银行·锦程卡", "新乡市商业银行·新卡", "晋中银行·九州方圆借记卡", "晋中银行·九州方圆卡", "驻马店银行·驿站卡", "驻马店银行·驿站卡", "驻马店银行·公务卡", "衡水银行·金鼎卡", "衡水银行·借记IC卡",
"周口银行·如愿卡", "周口银行·公务卡", "阳泉市商业银行·金鼎卡", "阳泉市商业银行·金鼎卡", "宜宾市商业银行·锦程卡", "宜宾市商业银行·借记IC卡", "库尔勒市商业银行·孔雀胡杨卡", "雅安市商业银行·锦城卡",
"雅安市商业银行·--", "安阳银行·安鼎卡", "信阳银行·信阳卡", "信阳银行·公务卡", "信阳银行·信阳卡", "华融湘江银行·华融卡", "华融湘江银行·华融卡", "营口沿海银行·祥云借记卡", "景德镇商业银行·瓷都卡",
"哈密市商业银行·瓜香借记卡", "湖北银行·金牛卡", "湖北银行·汉江卡", "湖北银行·借记卡", "湖北银行·三峡卡", "湖北银行·至尊卡", "湖北银行·金融IC卡", "西藏银行·借记IC卡", "新疆汇和银行·汇和卡",
"广东华兴银行·借记卡", "广东华兴银行·华兴银联公司卡", "广东华兴银行·华兴联名IC卡", "广东华兴银行·华兴金融IC借记卡", "濮阳银行·龙翔卡", "宁波通商银行·借记卡", "甘肃银行·神舟兴陇借记卡",
"甘肃银行·甘肃银行神州兴陇IC卡", "枣庄银行·借记IC卡", "本溪市商业银行·借记卡", "盛京银行·医保卡", "上海农商银行·如意卡(银联卡)", "上海农商银行·如意卡(银联卡)", "上海农商银行·鑫通卡",
"上海农商银行·国际如意卡", "上海农商银行·借记IC卡", "常熟市农村商业银行·粒金贷记卡(银联卡)", "常熟市农村商业银行·公务卡", "常熟市农村商业银行·粒金准贷卡", "常熟农村商业银行·粒金借记卡(银联卡)",
"常熟农村商业银行·粒金IC卡", "常熟农村商业银行·粒金卡", "深圳农村商业银行·信通卡(银联卡)", "深圳农村商业银行·信通商务卡(银联卡)", "深圳农村商业银行·信通卡", "深圳农村商业银行·信通商务卡",
"广州农村商业银行·福农太阳卡", "广东南海农村商业银行·盛通卡", "广东南海农村商业银行·盛通卡(银联卡)", "佛山顺德农村商业银行·恒通卡(银联卡)", "佛山顺德农村商业银行·恒通卡",
"佛山顺德农村商业银行·恒通卡(银联卡)", "江阴农村商业银行·暨阳公务卡", "江阴市农村商业银行·合作贷记卡(银联卡)", "江阴农村商业银行·合作借记卡", "江阴农村商业银行·合作卡(银联卡)",
"江阴农村商业银行·暨阳卡", "重庆农村商业银行·江渝借记卡VIP卡", "重庆农村商业银行·江渝IC借记卡", "重庆农村商业银行·江渝乡情福农卡", "东莞农村商业银行·信通卡(银联卡)",
"东莞农村商业银行·信通卡(银联卡)", "东莞农村商业银行·信通信用卡", "东莞农村商业银行·信通借记卡", "东莞农村商业银行·贷记IC卡", "张家港农村商业银行·一卡通(银联卡)",
"张家港农村商业银行·一卡通(银联卡)", "张家港农村商业银行·", "北京农村商业银行·信通卡", "北京农村商业银行·惠通卡", "北京农村商业银行·凤凰福农卡", "北京农村商业银行·惠通卡",
"北京农村商业银行·中国旅行卡", "北京农村商业银行·凤凰卡", "天津农村商业银行·吉祥商联IC卡", "天津农村商业银行·信通借记卡(银联卡)", "天津农村商业银行·借记IC卡",
"鄞州农村合作银行·蜜蜂借记卡(银联卡)", "宁波鄞州农村合作银行·蜜蜂电子钱包(IC)", "宁波鄞州农村合作银行·蜜蜂IC借记卡", "宁波鄞州农村合作银行·蜜蜂贷记IC卡", "宁波鄞州农村合作银行·蜜蜂贷记卡",
"宁波鄞州农村合作银行·公务卡", "成都农村商业银行·福农卡", "成都农村商业银行·福农卡", "珠海农村商业银行·信通卡(银联卡)", "太仓农村商业银行·郑和卡(银联卡)", "太仓农村商业银行·郑和IC借记卡",
"无锡农村商业银行·金阿福", "无锡农村商业银行·借记IC卡", "黄河农村商业银行·黄河卡", "黄河农村商业银行·黄河富农卡福农卡", "黄河农村商业银行·借记IC卡", "天津滨海农村商业银行·四海通卡",
"天津滨海农村商业银行·四海通e芯卡", "武汉农村商业银行·汉卡", "武汉农村商业银行·汉卡", "武汉农村商业银行·中国旅游卡", "江南农村商业银行·阳湖卡(银联卡)", "江南农村商业银行·天天红火卡",
"江南农村商业银行·借记IC卡", "海口联合农村商业银行·海口联合农村商业银行合卡", "湖北嘉鱼吴江村镇银行·垂虹卡", "福建建瓯石狮村镇银行·玉竹卡", "浙江平湖工银村镇银行·金平卡", "重庆璧山工银村镇银行·翡翠卡",
"重庆农村商业银行·银联标准贷记卡", "重庆农村商业银行·公务卡", "南阳村镇银行·玉都卡", "晋中市榆次融信村镇银行·魏榆卡", "三水珠江村镇银行·珠江太阳卡", "东营莱商村镇银行·绿洲卡", "建设银行·单位结算卡",
"玉溪市商业银行·红塔卡"
};
}

@ -9,11 +9,8 @@ import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.demo.customerreceivingaddress.entity.CustomerReceivingAddress;
import org.jeecg.modules.demo.customerreceivingaddress.service.ICustomerReceivingAddressService;
@ -42,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 顾客地址表
* @Author: jeecg-boot
* @Date: 2022-12-05
* @Date: 2022-12-22
* @Version: V1.0
*/
@Api(tags="顾客地址表")
@ -52,7 +49,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
public class CustomerReceivingAddressController extends JeecgController<CustomerReceivingAddress, ICustomerReceivingAddressService> {
@Autowired
private ICustomerReceivingAddressService customerReceivingAddressService;
/**
* 分页列表查询
*
@ -74,35 +71,7 @@ public class CustomerReceivingAddressController extends JeecgController<Customer
IPage<CustomerReceivingAddress> pageList = customerReceivingAddressService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 分页列表查询
*
* @param customerReceivingAddress
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "顾客地址表-分页列表查询")
@ApiOperation(value="顾客地址表-分页列表查询", notes="顾客地址表-分页列表查询")
@GetMapping(value = "/listcustom")
public Result<?> listcustom(CustomerReceivingAddress customerReceivingAddress,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
QueryWrapper<CustomerReceivingAddress> queryWrapper = QueryGenerator.initQueryWrapper(customerReceivingAddress, req.getParameterMap());
queryWrapper.eq("createBy",sysUser.getUsername());
Page<CustomerReceivingAddress> page = new Page<CustomerReceivingAddress>(pageNo, pageSize);
IPage<CustomerReceivingAddress> pageList = customerReceivingAddressService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
@ -113,14 +82,14 @@ public class CustomerReceivingAddressController extends JeecgController<Customer
@ApiOperation(value="顾客地址表-添加", notes="顾客地址表-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody CustomerReceivingAddress customerReceivingAddress) {
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if(customerReceivingAddress.getReceiver()=="" || customerReceivingAddress.getReceiver()==null ){
customerReceivingAddress.setReceiver(loginUser.getUsername());
if(customerReceivingAddress.getSort()<0){
return Result.error("排序数字必须大于0!");
}else {
customerReceivingAddressService.save(customerReceivingAddress);
return Result.OK("添加成功!");
}
customerReceivingAddressService.save(customerReceivingAddress);
return Result.OK("添加成功!");
}
/**
* 编辑
*
@ -131,10 +100,14 @@ public class CustomerReceivingAddressController extends JeecgController<Customer
@ApiOperation(value="顾客地址表-编辑", notes="顾客地址表-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@RequestBody CustomerReceivingAddress customerReceivingAddress) {
customerReceivingAddressService.updateById(customerReceivingAddress);
return Result.OK("编辑成功!");
if(customerReceivingAddress.getSort()<0){
return Result.error("排序数字必须大于0!");
}else {
customerReceivingAddressService.updateById(customerReceivingAddress);
return Result.OK("编辑成功!");
}
}
/**
* 通过id删除
*
@ -148,7 +121,7 @@ public class CustomerReceivingAddressController extends JeecgController<Customer
customerReceivingAddressService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
@ -162,7 +135,7 @@ public class CustomerReceivingAddressController extends JeecgController<Customer
this.customerReceivingAddressService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
/**
* 通过id查询
*

@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
/**
* @Description: 顾客地址表
* @Author: jeecg-boot
* @Date: 2022-12-05
* @Date: 2022-12-22
* @Version: V1.0
*/
@Data
@ -34,57 +34,62 @@ public class CustomerReceivingAddress implements Serializable {
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private String id;
private java.lang.String id;
/**创建人*/
@ApiModelProperty(value = "创建人")
private String createBy;
private java.lang.String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private Date createTime;
private java.util.Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private String updateBy;
private java.lang.String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private Date updateTime;
private java.util.Date updateTime;
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private String sysOrgCode;
private java.lang.String sysOrgCode;
/**用户*/
@Excel(name = "用户", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username")
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
@Excel(name = "用户", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "id")
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
@ApiModelProperty(value = "用户")
private String userId;
private java.lang.String userId;
/**用户*/
@Excel(name = "用户", width = 15)
@ApiModelProperty(value = "用户")
private java.lang.String usernamme;
/**城市*/
@Excel(name = "城市", width = 15)
@ApiModelProperty(value = "城市")
private String cityId;
private java.lang.String cityId;
/**地址*/
@Excel(name = "地址", width = 15)
@ApiModelProperty(value = "地址")
private String address;
private java.lang.String address;
/**邮编*/
@Excel(name = "邮编", width = 15)
@ApiModelProperty(value = "邮编")
private String zipCode;
private java.lang.String zipCode;
/**收货人*/
@Excel(name = "收货人", width = 15)
@ApiModelProperty(value = "收货人")
private String receiver;
private java.lang.String receiver;
/**联系电话*/
@Excel(name = "联系电话", width = 15)
@ApiModelProperty(value = "联系电话")
private String mobile;
private java.lang.String mobile;
/**排序*/
@Excel(name = "排序", width = 15)
@ApiModelProperty(value = "排序")
private Integer sort;
private java.lang.Integer sort;
/**标识*/
@Excel(name = "标识", width = 15)
@Excel(name = "标识", width = 15, dicCode = "shdzbs")
@Dict(dicCode = "shdzbs")
@ApiModelProperty(value = "标识")
private String labelcl;
private java.lang.String labelcl;
}

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 顾客地址表
* @Author: jeecg-boot
* @Date: 2022-12-05
* @Date: 2022-12-22
* @Version: V1.0
*/
public interface CustomerReceivingAddressMapper extends BaseMapper<CustomerReceivingAddress> {

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 顾客地址表
* @Author: jeecg-boot
* @Date: 2022-12-05
* @Date: 2022-12-22
* @Version: V1.0
*/
public interface ICustomerReceivingAddressService extends IService<CustomerReceivingAddress> {

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 顾客地址表
* @Author: jeecg-boot
* @Date: 2022-12-05
* @Date: 2022-12-22
* @Version: V1.0
*/
@Service

@ -32,6 +32,10 @@ public class ZyStyleAccessoriesServiceImpl extends ServiceImpl<ZyStyleAccessorie
for (ZyStyleAccessories zy : list) {
String typeName = zyStyleFabricMapper.getTypeName(zy.getStyleId());
zy.setTypeName(typeName);
String styleName = zyStyleFabricMapper.getStyleNameByStyleId(zy.getStyleId());
zy.setStyleId(styleName);
String accessoriesName = zyStyleFabricMapper.getAccessoriesNameByStyleId(zy.getAccessoriesId());
zy.setAccessoriesId(accessoriesName);
}
return list;
}

@ -128,7 +128,7 @@ public class ZyClothsStyleController extends JeecgController<ZyClothsStyle, IZyC
@ApiOperation(value = "服装款式详情", notes = "根据服装款式id进行查询")
@GetMapping(value = "/detail")
public Result<?> detail(@RequestParam(name = "id", required = true) String id) {
System.out.println("controller层接受到的id: styleId: "+id);
System.out.println("服装款式详情 /detail controller层接受到的id: styleId: "+id);
AllClothStyle allClothStyle = zyClothsStyleService.queryDetail(id);
return Result.OK(allClothStyle);
}

@ -5,6 +5,7 @@ import org.jeecg.modules.demo.zyStyleModular.entity.ZyStyleModular;
import org.jeecg.modules.demo.zyaccessories.entity.ZyStyleAccessories;
import org.jeecg.modules.zyclothsstyle.entity.ZyClothsStyle;
import org.jeecg.modules.zystylefabric.entity.NewZyStyleFabric;
import org.jeecg.modules.zystylemodel.entity.ZyStyleModel;
import org.jeecg.modules.zystylemodule.entity.NewStyleModule;
import java.util.List;
@ -12,7 +13,7 @@ import java.util.List;
@Data
public class AllClothStyle {
/**服装款式*/
private ZyClothsStyle zyClothsStyle;
private List<ZyClothsStyle> zyClothsStyles;
/**子模块 款式模块*/
private List<NewStyleModule> zyStyleModuleList;
/**子模块 款式面料*/
@ -20,6 +21,7 @@ public class AllClothStyle {
/**子模块 款式辅料*/
private List<ZyStyleAccessories> zyStyleAccessoriesList;
/*子模块 款式型号 因风格问题 暂不开发*/
private List<ZyStyleModel> zyStyleModels;
/**子模块 款式工序*/
private List<ZyStyleModular> zyStyleModularList;
}

@ -12,6 +12,8 @@ import org.jeecg.modules.zyclothsstyle.mapper.ZyClothsStyleMapper;
import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService;
import org.jeecg.modules.zystylefabric.entity.NewZyStyleFabric;
import org.jeecg.modules.zystylefabric.service.IZyStyleFabricService;
import org.jeecg.modules.zystylemodel.entity.ZyStyleModel;
import org.jeecg.modules.zystylemodel.service.IZyStyleModelService;
import org.jeecg.modules.zystylemodule.entity.NewStyleModule;
import org.jeecg.modules.zystylemodule.service.IZyStyleModuleService;
import org.springframework.beans.factory.annotation.Autowired;
@ -40,6 +42,8 @@ public class ZyClothsStyleServiceImpl extends ServiceImpl<ZyClothsStyleMapper, Z
private IZyStyleModularService zyStyleModularService;
@Autowired
private IZyStyleAccessoriesService zyStyleAccessoriesService;
@Autowired
private IZyStyleModelService zyStyleModelService;
@Resource
private ZyClothsStyleMapper zyClothsStyleMapper;
@ -53,8 +57,8 @@ public class ZyClothsStyleServiceImpl extends ServiceImpl<ZyClothsStyleMapper, Z
public AllClothStyle queryDetail(String id) {
AllClothStyle zyAllClothStyle = new AllClothStyle();
//服装款式详情
ZyClothsStyle zyClothsStyle = detail(id);
zyAllClothStyle.setZyClothsStyle(zyClothsStyle);
List<ZyClothsStyle> zyClothsStyles = detail(id);
zyAllClothStyle.setZyClothsStyles(zyClothsStyles);
//服装 款式 模块详情
List<NewStyleModule> zyStyleModuleList = zyStyleModuleService.detail(id);
zyAllClothStyle.setZyStyleModuleList(zyStyleModuleList);
@ -64,7 +68,9 @@ public class ZyClothsStyleServiceImpl extends ServiceImpl<ZyClothsStyleMapper, Z
//服装 辅料详情
List<ZyStyleAccessories> zyStyleAccessoriesList = zyStyleAccessoriesService.detail(id);
zyAllClothStyle.setZyStyleAccessoriesList(zyStyleAccessoriesList);
//服装 款式型号
List<ZyStyleModel> zyStyleModels = zyStyleModelService.detail(id);
zyAllClothStyle.setZyStyleModels(zyStyleModels);
//服装 工序详情
List<ZyStyleModular> zyStyleModularList = zyStyleModularService.detail(id);
zyAllClothStyle.setZyStyleModularList(zyStyleModularList);
@ -72,7 +78,7 @@ public class ZyClothsStyleServiceImpl extends ServiceImpl<ZyClothsStyleMapper, Z
return zyAllClothStyle;
}
public ZyClothsStyle detail(String id){
public List<ZyClothsStyle> detail(String id){
ZyClothsStyle zyClothsStyle = zyClothsStyleMapper.selectById(id);
//翻译规格 shape 和企业
String shape = zyClothsStyle.getShape();
@ -89,8 +95,10 @@ public class ZyClothsStyleServiceImpl extends ServiceImpl<ZyClothsStyleMapper, Z
}else {
zyClothsStyle.setEnterpriseId("null");
}
System.out.println("zyClothsStyle 服装款式详情"+zyClothsStyle);
return zyClothsStyle;
//System.out.println("zyClothsStyle 服装款式详情"+zyClothsStyle);
List<ZyClothsStyle> zyClothsStyles = new ArrayList<>();
zyClothsStyles.add(zyClothsStyle);
return zyClothsStyles;
}

@ -25,4 +25,12 @@ public interface ZyStyleFabricMapper extends BaseMapper<ZyStyleFabric> {
@Select("SELECT * FROM zy_style_fabric WHERE style_id = #{id}")
List<ZyStyleFabric> listByStyleId(String id);
/**根据styleId 拿到 款式名称*/
@Select("select style_names from zy_cloths_style where id = #{styleId}")
String getStyleNameByStyleId(String styleId);
/**根据styleId 拿到 面料名称*/
@Select("select contents from zy_accessories where id = #{styleId}")
String getAccessoriesNameByStyleId(String styleId);
}

@ -5,6 +5,7 @@ import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@ -43,23 +44,36 @@ public class ZyStyleModel implements Serializable {
/**是否默认尺码*/
@Excel(name = "是否默认尺码", width = 15)
@ApiModelProperty(value = "是否默认尺码")
//dictCode: 'isdefault',
private java.lang.Integer isdefault;
@TableField(exist = false)
private String isDefaultSize;
/**型号编码*/
@Excel(name = "型号编码", width = 15)
@ApiModelProperty(value = "型号编码")
//dictCode: 'modenumber'
private java.lang.String modelNumber;
/**码数*/
@Excel(name = "码数", width = 15)
@ApiModelProperty(value = "码数")
//dictCode: 'size'
private java.lang.Integer size;
/**型*/
@Excel(name = "型", width = 15)
@ApiModelProperty(value = "型")
//dictCode: 'hsize'
private java.lang.String anumbers;
/**号*/
@Excel(name = "号", width = 15)
@ApiModelProperty(value = "号")
//dictCode: 'xsize'
private java.lang.String bnumbers;
/**领大*/
@Excel(name = "领大", width = 15)
@ApiModelProperty(value = "领大")
@ -97,4 +111,6 @@ public class ZyStyleModel implements Serializable {
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "创建时间")
private java.util.Date createTime;
}

@ -4,6 +4,7 @@ import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Select;
import org.jeecg.modules.zystylemodel.entity.ZyStyleModel;
/**
@ -14,4 +15,6 @@ import org.jeecg.modules.zystylemodel.entity.ZyStyleModel;
*/
public interface ZyStyleModelMapper extends BaseMapper<ZyStyleModel> {
@Select("SELECT * FROM zy_style_model WHERE style_id = #{id}")
List<ZyStyleModel> listByStyleId(String id);
}

@ -4,6 +4,8 @@ package org.jeecg.modules.zystylemodel.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.zystylemodel.entity.ZyStyleModel;
import java.util.List;
/**
* @Description: zy_style_model
* @Author: jeecg-boot
@ -12,4 +14,5 @@ import org.jeecg.modules.zystylemodel.entity.ZyStyleModel;
*/
public interface IZyStyleModelService extends IService<ZyStyleModel> {
List<ZyStyleModel> detail(String id);
}

@ -2,19 +2,107 @@ package org.jeecg.modules.zystylemodel.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.zystylefabric.mapper.ZyStyleFabricMapper;
import org.jeecg.modules.zystylemodel.entity.ZyStyleModel;
import org.jeecg.modules.zystylemodel.mapper.ZyStyleModelMapper;
import org.jeecg.modules.zystylemodel.service.IZyStyleModelService;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.util.List;
/**
* @Description: zy_style_model
* @Author: jeecg-boot
* @Date: 2022-09-17
* @Date: 2022-09-17
* @Version: V1.0
*/
@Service
public class ZyStyleModelServiceImpl extends ServiceImpl<ZyStyleModelMapper, ZyStyleModel> implements IZyStyleModelService {
@Resource
private ZyStyleModelMapper zyStyleModelMapper;
@Resource
private ZyStyleFabricMapper zyStyleFabricMapper;
@Override
public List<ZyStyleModel> detail(String id) {
List<ZyStyleModel> zyStyleModels = zyStyleModelMapper.listByStyleId(id);
for (ZyStyleModel zy : zyStyleModels) {
String styleName = zyStyleFabricMapper.getStyleNameByStyleId(zy.getStyleId());
if (StringUtils.hasText(styleName)) {
zy.setStyleId(styleName);
} else {
zy.setStyleId(null);
}
//是否默认尺码
Integer isDefault = zy.getIsdefault();
if (isDefault == 0) {
zy.setIsDefaultSize("否");
} else if (isDefault == 1) {
zy.setIsDefaultSize("是");
} else {
zy.setIsDefaultSize(null);
}
//码数
zy.setSize(zy.getSize()+36);
//型
zy.setAnumbers(aHandleNumber(zy.getAnumbers()));
//号
zy.setBnumbers(bHandleNumber(zy.getBnumbers()));
}
return zyStyleModels;
}
public String aHandleNumber(String num){
if (StringUtils.isEmpty(num)){
return "null";
}
switch (num) {
case "1":
return "80A";
case "2":
return "84A";
case "3":
return "88A";
case "4":
return "92A";
case "5":
return "96A";
case "6":
return "100A";
case "7":
return "104A";
case "8":
return "108A";
case "9":
return "112A";
}
return num;
}
public String bHandleNumber(String num){
if (StringUtils.isEmpty(num)){
return "null";
}
switch (num) {
case "1":
return "160";
case "2":
return "165";
case "3":
return "170";
case "4":
return "175";
case "5":
return "180";
case "6":
return "185";
}
return num;
}
}

@ -25,9 +25,11 @@ import org.jeecg.modules.zyclothsstyle.service.IZyClothsStyleService;
import org.jeecg.modules.zystylefabric.mapper.ZyStyleFabricMapper;
import org.jeecg.modules.zystylemodule.entity.NewStyleModule;
import org.jeecg.modules.zystylemodule.entity.ZyStyleModule;
import org.jeecg.modules.zystylemodule.mapper.ZyStyleModuleMapper;
import org.jeecg.modules.zystylemodule.service.IZyStyleModuleService;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
@ -54,7 +56,8 @@ public class ZyStyleModuleController extends JeecgController<ZyStyleModule, IZyS
@Resource
private ZyStyleFabricMapper zyStyleFabricMapper;
@Resource
private ZyStyleModuleMapper zyStyleModuleMapper;
/**
* 分页列表查询
@ -72,64 +75,40 @@ public class ZyStyleModuleController extends JeecgController<ZyStyleModule, IZyS
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
System.err.println("ZyStyleModule 款式模块表 传来的 " + id);
//List<NewStyleModule> listNewStyleModules = new ArrayList<>();
//QueryWrapper<ZyStyleModule> queryWrapper = new QueryWrapper<>();
List<ZyStyleModule> zyStyleModules = zyStyleModuleMapper.getListByStyleId(id);
List<NewStyleModule> newStyleModuleList = zyStyleModuleService.changeList(zyStyleModules);
List<NewStyleModule> listNewStyleModules = new ArrayList<>();
QueryWrapper<ZyStyleModule> queryWrapper = new QueryWrapper<>();
System.err.println("ZyStyleModule 款式模块表 传来的 "+id);
if (id != null) {
queryWrapper.eq("style_id", id);
}
if (zyStyleModule2.getStyleId() != null || zyStyleModule2.getModularId() != null || zyStyleModule2.getTypeId() != null) {
if (zyStyleModule2.getStyleId() != null) {
queryWrapper.eq("style_id", zyStyleModule2.getStyleId());
}
if (zyStyleModule2.getModularId() != null) {
queryWrapper.eq("modular_id", zyStyleModule2.getModularId());
}
if (zyStyleModule2.getTypeId() != null) {
queryWrapper.eq("type_id", zyStyleModule2.getTypeId());
}
}
List<ZyStyleModule> list = zyStyleModuleService.list(queryWrapper);
for (ZyStyleModule zyStyleModule : list) {
NewStyleModule newSeMo = new NewStyleModule();
//编辑回显
newSeMo.setId(zyStyleModule.getId());
newSeMo.setTypeId(zyStyleModule.getTypeId());
newSeMo.setStyleId(zyStyleModule.getStyleId());
newSeMo.setModularId(zyStyleModule.getModularId());
//款式编号和名称
String styleId = zyStyleModule.getStyleId();
ZyClothsStyle styleById = zyClothsStyleService.getById(styleId);
newSeMo.setStyleNums(styleById.getNums());
newSeMo.setStyleNames(styleById.getStyleNames());
//模块编号和名称
String modularId = zyStyleModule.getModularId();
ZyClothsModular modularById = zyClothsModularService.getById(modularId);
newSeMo.setModularNums(modularById.getNums());
newSeMo.setModularName(modularById.getModularName());
newSeMo.setCreateTime(zyStyleModule.getCreateTime());
//服装类型 服装类型的id 不知道什么情况 传的是zy_cloths_style中的type_id
//String styleId1 = zyStyleModule.getStyleId();
String typeName = zyStyleFabricMapper.getTypeName(zyStyleModule.getStyleId());
//System.out.println(typeId);
//String typeNameByTypeId = zyClothsStyleMapper.getTypeNameByTypeId(typeId);
//System.err.println(typeNameByTypeId);
if (typeName != null){
newSeMo.setTypeName(typeName);
} else {
newSeMo.setTypeName("typeName为空");
}
listNewStyleModules.add(newSeMo);
}
IPage<NewStyleModule> pageList = new Page<>(pageNo, pageSize, listNewStyleModules.size());
pageList.setRecords(listNewStyleModules);
//System.out.println(pageList.getRecords());
IPage<NewStyleModule> pageList = new Page<>(pageNo, pageSize, newStyleModuleList.size());
pageList.setRecords(newStyleModuleList);
return Result.OK(pageList);
}
// if (id != null) {
// queryWrapper.eq("style_id", id);
// }
// if (zyStyleModule2.getStyleId() != null || zyStyleModule2.getModularId() != null || zyStyleModule2.getTypeId() != null) {
// if (zyStyleModule2.getStyleId() != null) {
// queryWrapper.eq("style_id", zyStyleModule2.getStyleId());
// }
// if (zyStyleModule2.getModularId() != null) {
// queryWrapper.eq("modular_id", zyStyleModule2.getModularId());
// }
// if (zyStyleModule2.getTypeId() != null) {
// queryWrapper.eq("type_id", zyStyleModule2.getTypeId());
// }
// }
// List<ZyStyleModule> list = zyStyleModuleService.list(queryWrapper);
// for (ZyStyleModule zyStyleModule : list) {
// listNewStyleModules.add(newSeMo);
// }
/**
* 分页列表查询
*
@ -166,15 +145,15 @@ public class ZyStyleModuleController extends JeecgController<ZyStyleModule, IZyS
@PostMapping(value = "/add")
public Result<Object> add(@RequestBody ZyStyleModule zyStyleModule) {
String[] split = zyStyleModule.getModularId().split(",");
QueryWrapper queryWrapper=new QueryWrapper();
queryWrapper.eq("type_id",zyStyleModule.getTypeId());
queryWrapper.eq("style_id",zyStyleModule.getStyleId());
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("type_id", zyStyleModule.getTypeId());
queryWrapper.eq("style_id", zyStyleModule.getStyleId());
for (String s : split) {
zyStyleModule.setModularId(s);
zyStyleModule.setId(null);
queryWrapper.eq("modular_id",zyStyleModule.getModularId());
int a=zyStyleModuleService.count(queryWrapper);
if(a>=1)
queryWrapper.eq("modular_id", zyStyleModule.getModularId());
int a = zyStyleModuleService.count(queryWrapper);
if (a >= 1)
return Result.error("存在以添加过的数据!!!");
zyStyleModuleService.save(zyStyleModule);
}
@ -193,12 +172,12 @@ public class ZyStyleModuleController extends JeecgController<ZyStyleModule, IZyS
//@RequiresPermissions("org.jeecg.modules.demo:zy_style_module:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<Object> edit(@RequestBody ZyStyleModule zyStyleModule) {
QueryWrapper queryWrapper=new QueryWrapper();
queryWrapper.eq("type_id",zyStyleModule.getTypeId());
queryWrapper.eq("style_id",zyStyleModule.getStyleId());
queryWrapper.eq("modular_id",zyStyleModule.getModularId());
int a=zyStyleModuleService.count(queryWrapper);
if(a>=1)
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("type_id", zyStyleModule.getTypeId());
queryWrapper.eq("style_id", zyStyleModule.getStyleId());
queryWrapper.eq("modular_id", zyStyleModule.getModularId());
int a = zyStyleModuleService.count(queryWrapper);
if (a >= 1)
return Result.error("修改失败,数据已存在!!!");
zyStyleModuleService.updateById(zyStyleModule);
return Result.OK("编辑成功!");

@ -5,6 +5,7 @@ import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Select;
import org.jeecg.modules.zystylemodule.entity.ZyStyleModule;
/**
@ -17,4 +18,7 @@ public interface ZyStyleModuleMapper extends BaseMapper<ZyStyleModule> {
/**根据服装款式的id style_id 查询所有*/
List<ZyStyleModule> handWritingList(String id);
@Select("SELECT * FROM zy_style_module WHERE style_id = #{id}")
List<ZyStyleModule> getListByStyleId(String id);
}

@ -16,4 +16,11 @@ import java.util.List;
public interface IZyStyleModuleService extends IService<ZyStyleModule> {
List<NewStyleModule> detail(String id);
/**
* @param zyStyleModules 原始数据List<ZyStyleModule>
* @return 新List类型NewStyleModule
*/
List<NewStyleModule> changeList(List<ZyStyleModule> zyStyleModules);
}

@ -14,11 +14,13 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
/**
* @Description: 款式模块表
@ -42,46 +44,40 @@ public class ZyStyleModuleServiceImpl extends ServiceImpl<ZyStyleModuleMapper, Z
@Override
public List<NewStyleModule> detail(String id) {
List<ZyStyleModule> list = zyStyleModuleMapper.handWritingList(id);
return changeList(list);
}
@Override
public List<NewStyleModule> changeList(List<ZyStyleModule> zyStyleModules) {
List<NewStyleModule> newStyleModuleList = new ArrayList<>();
for (ZyStyleModule zyStyleModule : list) {
for (ZyStyleModule zy : zyStyleModules) {
NewStyleModule newSeMo = new NewStyleModule();
//编辑回显
newSeMo.setId(zyStyleModule.getId());
newSeMo.setTypeId(zyStyleModule.getTypeId());
newSeMo.setStyleId(zyStyleModule.getStyleId());
newSeMo.setModularId(zyStyleModule.getModularId());
newSeMo.setId(zy.getId());
newSeMo.setTypeId(zy.getTypeId());
newSeMo.setStyleId(zy.getStyleId());
newSeMo.setModularId(zy.getModularId());
//款式编号和名称
String styleId = zyStyleModule.getStyleId();
ZyClothsStyle styleById = zyClothsStyleService.getById(styleId);
newSeMo.setStyleNums(styleById.getNums());
newSeMo.setStyleNames(styleById.getStyleNames());
ZyClothsStyle styleById = zyClothsStyleService.getById(zy.getStyleId());
if (!ObjectUtils.isEmpty(styleById)){
newSeMo.setStyleNums(styleById.getNums());
newSeMo.setStyleNames(styleById.getStyleNames());
}
//模块编号和名称
String modularId = zyStyleModule.getModularId();
ZyClothsModular modularById = zyClothsModularService.getById(modularId);
if(StringUtils.isEmpty(modularById)){
newSeMo.setModularNums("null");
newSeMo.setModularName("null");
}else {
ZyClothsModular modularById = zyClothsModularService.getById(zy.getModularId());
if (!Objects.isNull(modularById)){
newSeMo.setModularNums(modularById.getNums());
newSeMo.setModularName(modularById.getModularName());
}
newSeMo.setCreateTime(zyStyleModule.getCreateTime());
newSeMo.setCreateTime(zy.getCreateTime());
//服装类型 服装类型的id 不知道什么情况 传的是zy_cloths_style中的type_id
//String styleId1 = zyStyleModule.getStyleId();
String typeName = zyStyleFabricMapper.getTypeName(zyStyleModule.getStyleId());
//System.out.println(typeId);
//String typeNameByTypeId = zyClothsStyleMapper.getTypeNameByTypeId(typeId);
//System.err.println(typeNameByTypeId);
if (typeName != null){
String typeName = zyStyleFabricMapper.getTypeName(zy.getStyleId());
if (StringUtils.hasText(typeName)) {
newSeMo.setTypeName(typeName);
} else {
newSeMo.setTypeName("typeName为空");
}
newStyleModuleList.add(newSeMo);
}
return newStyleModuleList;
}
}

Loading…
Cancel
Save