顾客测体管理、顾客支付信息管理

zhc4dev
wangjiadong 2 years ago
parent 353931e45a
commit 5f07dc2b9d
  1. 62
      ant-design-vue-jeecg/src/views/customermeasure/admin/CustomerMeasureList.vue
  2. 2
      ant-design-vue-jeecg/src/views/customermeasure/admin/modules/CustomerMeasureForm.vue
  3. 37
      ant-design-vue-jeecg/src/views/customerpayment/admin/CustomerPaymentList.vue
  4. 23
      ant-design-vue-jeecg/src/views/customerpayment/admin/modules/CustomerPaymentForm.vue
  5. 59
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/controller/CustomerPaymentController.java
  6. 30
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/entity/CustomerPayment.java
  7. 5
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/mapper/CustomerPaymentMapper.java
  8. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/service/ICustomerPaymentService.java
  9. 2
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerpayment/service/impl/CustomerPaymentServiceImpl.java

@ -175,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",
@ -190,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: '操作',

@ -88,7 +88,7 @@
</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">

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

@ -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("添加成功!");
}
}
/**
* 编辑
*
@ -128,7 +111,7 @@ public class CustomerPaymentController extends JeecgController<CustomerPayment,
customerPaymentService.updateById(customerPayment);
return Result.OK("编辑成功!");
}
/**
* 通过id删除
*
@ -142,7 +125,7 @@ public class CustomerPaymentController extends JeecgController<CustomerPayment,
customerPaymentService.removeById(id);
return Result.OK("删除成功!");
}
/**
* 批量删除
*
@ -156,7 +139,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

Loading…
Cancel
Save