Skip to content

A
Aidea
Commit da850ac0 authored by 谢希宇's avatar 谢希宇
Browse files
Options

Aidea product update by Strive Date 2020-10-28

parent 6b9704b1
Hide whitespace changes
Inline Side-by-side
Showing with 823 additions and 238 deletions
aidea-modules/consult-module/target/classes/com/cftech/consultsheet/dao/ConsultSheetMapper.xml
View file @ da850ac0
...@@ -61,10 +61,10 @@ ...@@ -61,10 +61,10 @@
<sql id="sqlColumns"> <sql id="sqlColumns">
a.id, a.id,
a.consult_id, a.consult_id,
CONVERT(AES_DECRYPT(a.user_name,'aideakey') USING UTF8), CONVERT(AES_DECRYPT(a.user_name,'aideakey') USING UTF8) ,
CONVERT(AES_DECRYPT(a.number_id,'aideakey') USING UTF8), CONVERT(AES_DECRYPT(a.number_id,'aideakey') USING UTF8) ,
a.sex, a.sex,
CONVERT(AES_DECRYPT(a.iphone,'aideakey') USING UTF8), CONVERT(AES_DECRYPT(a.iphone,'aideakey') USING UTF8) ,
a.past_records, a.past_records,
a.prescription, a.prescription,
a.doctor_id, a.doctor_id,
......
aidea-modules/order-module-web/src/main/webapp/WEB-INF/views/order/orderSendOut.html 0 → 100644
View file @ da850ac0
<!DOCTYPE html>
<!--[if IE 8]>
<html lang="en" class="ie8 no-js"> <![endif]-->
<!--[if IE 9]>
<html lang="en" class="ie9 no-js"> <![endif]-->
<!--[if !IE]><!-->
<html>
<!--<![endif]-->
<!-- BEGIN HEAD -->
<head>
<base href="#springUrl('/assets/adminlte/')"/>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>工作台</title>
<!-- Tell the browser to be responsive to screen width -->
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
<!-- Bootstrap 3.3.5 -->
<link rel="stylesheet" href="bootstrap/css/bootstrap.min.css">
<!-- Font Awesome -->
<link rel="stylesheet" href="plugins/font-awesome/css/font-awesome.min.css">
<!-- Ionicons -->
<link rel="stylesheet" href="plugins/ionicons/css/ionicons.min.css">
<!-- DataTables -->
<link rel="stylesheet" href="plugins/datatables/dataTables.bootstrap.css">
<link rel="stylesheet" href="plugins/select2/select2.min.css">
<!-- Theme style -->
<link rel="stylesheet" href="dist/css/AdminLTE.min.css">
<!-- AdminLTE Skins. Choose a skin from the css/skins
folder instead of downloading all of them to reduce the load. -->
<link rel="stylesheet" href="dist/css/skins/_all-skins.min.css">
<!-- iCheck -->
<link rel="stylesheet" href="plugins/iCheck/flat/blue.css">
<!-- Date Picker -->
<link rel="stylesheet" href="plugins/datepicker/datepicker3.css">
<!-- Daterange picker -->
<link rel="stylesheet" href="plugins/daterangepicker/daterangepicker-bs3.css">
<!-- bootstrap wysihtml5 - text editor -->
<link rel="stylesheet" href="plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.min.css">
<!--validate css-->
<link rel="stylesheet" href="plugins/jquery-validation/css/validate.css">
<!--fileinput css-->
<link rel="stylesheet" href="plugins/bootstrap-fileinput/bootstrap-fileinput.css">
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head>
<!-- END HEAD -->
<body class="hold-transition skin-blue sidebar-mini">
<div class="wrapper">
<div class="content-wrapper" style="margin-left:0;">
<section class="content-header">
<h1>
需求清单管理
<small>需求清单管理</small>
</h1>
<ol class="breadcrumb">
<li><a href="#"><i class="fa fa-dashboard"></i>首页</a></li>
<li><a class="active">需求清单管理</a></li>
</ol>
</section>
<!-- Main content -->
<section class="content">
<div class="row">
<div class="col-xs-12">
<!-- general form elements disabled -->
<div class="box box-primary">
<!--<form role="form" id="myForm">-->
<input id="id" name="id" value="$!{data.id}" hidden="true"/>
<div class="box-body">
<div class="panel panel-primary">
<div class="panel-heading">订单信息</div>
<div class="panel-body">
<div class="form-group form-md-line-input col-xs-5">
<label>订单编码<font style="color: red"></font></label>
<input type="text"
class="form-control" name="orderCode"
id="number" readonly="readonly"
maxlength="50" placeholder="订单编码"
value="$!{data.number}">
</div>
<div class="form-group form-md-line-input col-xs-5">
<label>快递单号<font style="color: red"></font></label>
<input type="text"
class="form-control" name="courierNumber"
id="courierNumber" readonly="readonly"
maxlength="50" placeholder="快递单号"
value="$!{data.courierNumber}" >
</div>
<div class="form-group form-md-line-input col-xs-5">
<label>订单总价<font style="color: red"></font></label>
<input type="text"
class="form-control" name="orderAmount"
id="orderAmount" readonly="readonly"
maxlength="50" placeholder="订单金额"
value="$!{data.orderAmount}"
>
</div>
<div class="form-group form-md-line-input col-xs-5">
<label>收货地址<font style="color: red"></font></label>
<input type="text"
class="form-control" name="address"
id="address" readonly="readonly"
maxlength="50" placeholder="收货地址"
value="$!{data.address}"
>
</div>
<div class="form-group form-md-line-input col-xs-5">
<label>订单状态<font style="color: red"></font></label>
<input type="text"
class="form-control" name="payStatus"
id="payStatus" readonly="readonly"
maxlength="50" placeholder=""
value="$!{data.payStatus}"
>
</div>
<div class="form-group form-md-line-input col-xs-5">
<label>支付备注<font style="color: red"></font></label>
<input type="text"
class="form-control" name="description"
id="description" readonly="readonly"
maxlength="50" placeholder=""
value="$!{data.description}"
>
</div>
<div class="form-group form-md-line-input col-xs-5">
<label>支付交易号<font style="color: red"></font></label>
<input type="text"
class="form-control" name="tradeNo"
id="tradeNo" readonly="readonly"
maxlength="50" placeholder=""
value="$!{data.tradeNo}"
>
</div>
<div class="form-group form-md-line-input col-xs-5">
<label>创建时间<font style="color: red"></font></label>
<input type="text"
class="form-control" name="createTime"
id="createTime" readonly="readonly"
maxlength="50" placeholder=""
value="$!{data.createTime}"
>
</div>
<div class="form-group form-md-line-input col-xs-8">
<label>订单取消原因<font style="color: red"></font></label>
<textarea class="form-control" id="orderCancel" name="orderCancel" rows="3" readonly>$!{data.orderCancel}</textarea>
</div>
</div>
</div>
<div class="panel panel-primary">
<div class="panel-heading">商品信息</div>
<div class="panel-body">
<div class="form-group form-md-line-input">
<div id="group" class="list-group">
<li class="list-group-item">
<th style=""><label style="width: 180px;margin-right: 50px;text-align: center">商品名称</label></th>
<th style=""><label style="width: 160px;margin-right: 50px;text-align: center">商品编码</label></th>
<th style=""><label style="width: 180px;margin-right: 50px;text-align: center">购买数量</label></th>
<th style=""><label style="width: 180px;margin-right: 50px;text-align: center">出货数量</label></th>
</li>
</div>
<div class="form-group form-md-line-input col-xs-8">
<label>已扫商品编码<font></font></label>
<textarea class="form-control" id="scanGoodsCode" name="scanGoodsCode" rows="5" readonly></textarea>
</div>
<!--<button type="button" class="search btn btn-primary" onclick="clickAdd()">添加商品和数量</button>-->
</div>
</div>
</div>
<div class="box-footer">
#if($shiro.hasPermission("qy:order:edit"))
<button class="btn btn-primary" onclick="save()">保存</button>
#end
<a href="#springUrl('/a/order/list')" class="btn btn-default">取消</a>
</div>
<!--</form>-->
<!-- /.box-body -->
</div><!-- /.box -->
</div>
</div><!-- /.col -->
</div><!-- /.row -->
</section><!-- /.content -->
</div><!-- /.content-wrapper -->
<!-- Add the sidebar's background. This div must be placed
immediately after the control sidebar -->
<div class="control-sidebar-bg"></div>
</div><!-- ./wrapper -->
<script src="plugins/jQuery/jQuery-2.1.4.min.js"></script>
<!-- Bootstrap 3.3.5 -->
<script src="bootstrap/js/bootstrap.min.js"></script>
<script src="plugins/select2/select2.full.min.js"></script>
<!-- DataTables -->
<script src="plugins/datatables/jquery.dataTables.min.js"></script>
<script src="plugins/datatables/extensions/i18n/lanauage_ch.js"></script>
<script src="plugins/datatables/dataTables.bootstrap.min.js"></script>
<!-- SlimScroll -->
<script src="plugins/slimScroll/jquery.slimscroll.min.js"></script>
<!-- FastClick -->
<script src="plugins/fastclick/fastclick.min.js"></script>
<!--fileinput js-->
<script src="plugins/bootstrap-fileinput/bootstrap-fileinput.js"></script>
<!-- AdminLTE App -->
<script src="dist/js/app.min.js"></script>
<script src="plugins/bootstrap-maxlength/bootstrap-maxlength.min.js" type="text/javascript"></script>
<script src="plugins/security/sha256.js" type="text/javascript"></script>
<script src="plugins/jquery-validation/js/jquery.validate.min.js"></script>
<script src="js/jquery.form.min.js"></script>
<script type="text/javascript" charset="utf-8" src="plugins/ueditor-min-1.4.3/ueditor.config.js"></script>
<script type="text/javascript" charset="utf-8" src="plugins/ueditor-min-1.4.3/ueditor.all.js"></script>
<script type="text/javascript" charset="utf-8" src="plugins/ueditor-min-1.4.3/lang/zh-cn/zh-cn.js"></script>
<script src="common/js/cfapp.js"></script>
<!-- END PAGE LEVEL PLUGINS -->
<script>
var csrf='${_csrf.token}';
var csrf_header='${_csrf.headerName}';
var areaList = [];
//扫码全局变量
var scanCodeStr = "";
var scanSubCode = "";
var avgTime = 30;
var lastTime = 0;
//触发顺序keydown keypress keyup
$(document).on('keydown', function(event){
let subCode = String.fromCharCode(event.keyCode);
let currTime = new Date().getTime();
let spaceTime = currTime - lastTime;
//扫码间隔大于30，未认为输入
if (lastTime != 0 && spaceTime > avgTime) {
return;
}
if (event.keyCode == 13) {
lastTime = 0;
let nextEleV = 0;
let scanNumEle = null;
let flag = false;
$("#group").find('input[name="productCode"]').each(function() {
if ($(this).val() == scanSubCode) {
nextEleV = $(this).next().val();
scanNumEle = $(this).next().next();
flag = true;
}
});
if (!flag) {
Cfapp.alert({
message: "商品未在订单中!",
btntext: "确定",
success: function () {}
});
scanSubCode = "";
return;
}
scanCodeStr += scanSubCode + "|";
let count = 0;
if (scanCodeStr != "" && scanCodeStr != null) {
let arr = scanCodeStr.split("|");
console.log(arr.length);
for(let i=0; i<arr.length; i++) {
if (arr[i] == scanSubCode)
count++;
}
if (nextEleV < count) {
Cfapp.alert({
message: "商品超过订单数量!",
btntext: "确定",
success: function () {}
});
scanSubCode = "";
return;
}
}
scanNumEle.val(count);
$('textarea[name="scanGoodsCode"]').text(scanCodeStr);
scanSubCode = "";
return;
}
scanSubCode += subCode;
lastTime = currTime;
});
// $(document).on('keypress', function(event){
// if(event.keyCode == 13){
// //alert('你按下了Enter' + 2);
// }
// });
//
// $(document).on('keyup', function(event){
// if(event.keyCode == 13){
// //alert('你按下了Enter' + 3);
// }
// });
function checkProductCode(code) {
let flag = true;
$("#group").find('input[name="productCode"]').each(function(e) {
if (e.val() == code) {
let count = e.next().val();
let length = $('textarea[name="scanGoodsCode"]').text().split(code).length - 1;
if (count >= length)
return true;
}
});
if (!flag) {
return flag;
}
}
function list() {
var url = "#springUrl('/a/order/fromProduct')"
$.ajax({
url: url,
type: "GET",
success: function (data) {
areaList = JSON.parse(data.data);
// var province = document.querySelector('#selectProduct')
// for (index in areaList) {
// var op = new Option(areaList[index].productName, areaList[index].id, false, false)
// province.options[province.length] = op
// }
var provinceId = '$!{data.productId}';
var selectProductList = '$!{list}';
if (selectProductList != null && selectProductList != '') {
selectProductList = JSON.parse(selectProductList);
for (var i = 0; i < selectProductList.length; i++) {
var obj = selectProductList[i];
// if($(this).val() == obj.provinceId){
// $(this).attr('selected', 'selected');
// }
clickAdd(obj.id, obj.productId, obj.productName, obj.drugsNum, obj.price, obj.amount, obj.productNumber);
}
}
// $('#selectProduct option').each(function () {
// for(var index= 0;i<selectProductList.length;i++){
// var obj = selectProductList[i];
// if($(this).val() == obj.provinceId){
// $(this).attr('selected', 'selected');
// }
// }
//
// })
}
});
}
$().ready(function () {
$("#divClass").css('display', 'none')
var payStatus = $("#payStatus").val();
if (payStatus == '0') {
$("#payStatus").val("未付款");
} else if (payStatus == '1') {
$("#payStatus").val("已付款");
} else if (payStatus == '2') {
$("#payStatus").val("已取消");
} else {
$("#payStatus").val("");
}
var confirm = $("#confirm").val();
if (confirm = '0') {
$("#divClass").css('display', 'blocks')
}
Cfapp.init();
list();
// var selectdrugsNum = $("#selectdrugsNum");
// for (var i = 1; i <=30; i ++){
// selectdrugsNum.append("<option value='"+[i]+"'>"+[i]+"</option>")
// }
// var drugsNum = "$!{data.drugsNum}";
// $('#selectdrugsNum option').each(function () {
// if($(this).val() == drugsNum){
// $(this).attr('selected', 'selected');
// }
// })
});
function clickAdd(id, productId, productName, count, price, amount, number) {
var options = "";
if (productName && productName != null) {
options = `<input name="productName" class="form-control" style="width: 180px ;margin-right: 50px" type='text' readonly="readonly" value="`+productName+`"></input>`;
}
var idHtml = "";
if (id && id != null){
idHtml +=`<input type="hidden" name="idDetail" value="${id}">`
}else{
idHtml +=`<input type="hidden" name="idDetail" value="">`
}
var htmlNumber = "";
if (number && number != null) {
htmlNumber += `<input name="productCode" class="form-control" style="width: 180px ;margin-right: 50px" type='text' readonly="readonly" value="`+number+`"></input>`;
}
var listHtml = "";
if (count && count != null) {
price
listHtml += `<input name="orderNum" class="form-control" type="text" style="width: 180px;margin-right: 50px;" readonly value=${count} ></input>`;
} else {
listHtml += `<input name="orderNum" class="form-control" type="text" style="width: 180px ;margin-right: 50px;" readonly value="1"></input>`;
}
var HtmlAmount = `<input name="sendNum" class="form-control" type="text" style="width: 180px ;margin-right: 50px;" readonly value="0"></input>`;
//扫码商品编码
var HtmlCode = `<button name="delGoods" type="button" class="btn btn-danger">删除</button>`;
let html = `<li id="form-translate" class="list-group-item" style="display:flex;">
${idHtml}
${options}
${htmlNumber}
${listHtml}
${HtmlAmount}
${HtmlCode}
</li>`;
$("#group").append(html);
toTal()
}
function toTal() {
// $('#group').on('click', '.scanGoods', function() {
// $(this).prev().val("11111111111");
// });
var count = 0
$('.group [name="htmlAmount"]').each(function(index, item){
count += +item.value
})
$("#orderAmount").val(count.toFixed(2));
}
/**
* 保存事件
*/
function save() {
var arr = []
var obj = {}
$('.translate').each((index, item) => {
var txt = $(item).find('[name="releas"]').val()
if (obj[txt]) {
arr.push(index)
return
} else {
obj[txt] = true
}
})
if (arr.length > 0) {
Cfapp.alert({
message: "无法增加重复商品!",
btntext: "确定",
success: function () {
}
});
return;
}
var id = $("#id").val()
var orderAmount = $("#orderAmount").val()
var datas = [];
$('.translate').each(function (index,item){
const idDetail = $(item).find('[name="idDetail"]').val()
const productId = $(item).find('[name="releas"]').val()
const drugsNum = $(item).find('[name="listHtml"]').val()
const price = $(item).find('[name="htmlPrice"]').val()
const amount = $(item).find('[name="htmlAmount"]').val()
datas.push({
id : id,
idDetail : idDetail,
productId :productId,
drugsNum : drugsNum,
price : price,
amount : amount,
orderAmount :orderAmount
})
})
var url = "#springUrl('/a/order/formData')"
$.ajax({
url: url,
type: "POST",
dateType:'json',
headers:{"Accept": "application/json;charset=UTF-8"},
data : {_csrf:csrf,_csrf_header:csrf_header,datas:JSON.stringify(datas)},
success :function (rsp) {
if(rsp.errorNo == "0"){
Cfapp.alert({
message: "修改成功",
btntext: "确定",
success: function () {
location.href = "#springUrl('/a/order/list')";
}
});
}else{
Cfapp.alert({
message: "修改失败",
btntext: "确定",
success: function () {
let idTmp = $('input[name="id"]').val();
location.href = "#springUrl('/a/order/form?id="+idTmp+"')";
}
});
}
}
});
}
var recdTypeAdd = function () {
var initForm = function () {
var initFormCtrl = function () {
bindEvent();
};
var bindEvent = function () {
$('.scanCode').focus();
};
initFormCtrl();
};
return {
//main function to initiate the module
init: function () {
initForm();
}
};
}();
</script>
</body>
<!-- END BODY -->
</html>
\ No newline at end of file
aidea-modules/order-module-web/src/main/webapp/WEB-INF/views/order/orderform.html
View file @ da850ac0
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
<!-- DataTables --> <!-- DataTables -->
<link rel="stylesheet" href="plugins/datatables/dataTables.bootstrap.css"> <link rel="stylesheet" href="plugins/datatables/dataTables.bootstrap.css">
<link rel="stylesheet" href="plugins/select2/select2.min.css">
<!-- Theme style --> <!-- Theme style -->
<link rel="stylesheet" href="dist/css/AdminLTE.min.css"> <link rel="stylesheet" href="dist/css/AdminLTE.min.css">
<!-- AdminLTE Skins. Choose a skin from the css/skins <!-- AdminLTE Skins. Choose a skin from the css/skins
...@@ -76,112 +78,122 @@ ...@@ -76,112 +78,122 @@
<input id="id" name="id" value="$!{data.id}" hidden="true"/> <input id="id" name="id" value="$!{data.id}" hidden="true"/>
<div class="box-body"> <div class="box-body">
<div class="form-group form-md-line-input"> <div class="panel panel-primary">
<label>订单编码<font style="color: red"></font></label> <div class="panel-heading">订单信息</div>
<input type="text"
class="form-control" name="orderCode" <div class="panel-body">
id="orderCode" readonly="readonly" <div class="form-group form-md-line-input col-xs-5">
maxlength="50" placeholder="订单编码" <label>订单编码<font style="color: red"></font></label>
value="$!{data.orderCode}" <input type="text"
> class="form-control" name="orderCode"
<label>快递单号<font style="color: red"></font></label> id="number" readonly="readonly"
<input type="text" maxlength="50" placeholder="订单编码"
class="form-control" name="courierNumber" value="$!{data.number}">
id="courierNumber" readonly="readonly" </div>
maxlength="50" placeholder="快递单号"
value="$!{data.courierNumber}" <div class="form-group form-md-line-input col-xs-5">
> <label>快递单号<font style="color: red"></font></label>
<label>商品编码<font style="color: red"></font></label> <input type="text"
<input type="text" class="form-control" name="courierNumber"
class="form-control" name="productNumber" id="courierNumber" readonly="readonly"
id="productNumber" readonly="readonly" maxlength="50" placeholder="快递单号"
maxlength="50" placeholder="商品编码" value="$!{data.courierNumber}" >
value="$!{data.productNumber}" </div>
>
<br/> <div class="form-group form-md-line-input col-xs-5">
<label>订单总价<font style="color: red"></font></label>
<input type="text"
<div id="group" class="group"> class="form-control" name="orderAmount"
id="orderAmount" readonly="readonly"
maxlength="50" placeholder="订单金额"
<th style="width:15%; "><label value="$!{data.orderAmount}"
style="width: 180px;margin-right: 80px;text-align: center">商品名称</label></th> >
<th style=""><label style="width: 180px;margin-right: 80px;text-align: center">商品购买数量</label> </div>
</th>
<th style=""><label style="width: 160px;margin-right: 80px;text-align: center">商品单价</label></th> <div class="form-group form-md-line-input col-xs-5">
<th style=""><label style="width: 180px;margin-right: 80px;text-align: center">商品总价</label></th> <label>收货地址<font style="color: red"></font></label>
<input type="text"
class="form-control" name="address"
id="address" readonly="readonly"
maxlength="50" placeholder="收货地址"
value="$!{data.address}"
>
</div>
<div class="form-group form-md-line-input col-xs-5">
<label>订单状态<font style="color: red"></font></label>
<input type="text"
class="form-control" name="payStatus"
id="payStatus" readonly="readonly"
maxlength="50" placeholder=""
value="$!{data.payStatus}"
>
</div>
<div class="form-group form-md-line-input col-xs-5">
<label>支付备注<font style="color: red"></font></label>
<input type="text"
class="form-control" name="description"
id="description" readonly="readonly"
maxlength="50" placeholder=""
value="$!{data.description}"
>
</div>
<div class="form-group form-md-line-input col-xs-5">
<label>支付交易号<font style="color: red"></font></label>
<input type="text"
class="form-control" name="tradeNo"
id="tradeNo" readonly="readonly"
maxlength="50" placeholder=""
value="$!{data.tradeNo}"
>
</div>
<div class="form-group form-md-line-input col-xs-5">
<label>创建时间<font style="color: red"></font></label>
<input type="text"
class="form-control" name="createTime"
id="createTime" readonly="readonly"
maxlength="50" placeholder=""
value="$!{data.createTime}"
>
</div>
<div class="form-group form-md-line-input col-xs-8">
<label>订单取消原因<font style="color: red"></font></label>
<textarea class="form-control" id="orderCancel" name="orderCancel" rows="3" readonly>$!{data.orderCancel}</textarea>
</div>
</div> </div>
<br/> </div>
<button type="button" class="search btn btn-primary" onclick="clickAdd()">添加商品和数量
</button>
<br/><br/>
<label>订单总价<font style="color: red"></font></label>
<input type="text"
class="form-control" name="orderAmount"
id="orderAmount" readonly="readonly"
maxlength="50" placeholder="订单金额"
value="$!{data.orderAmount}"
> <label>收货地址<font style="color: red"></font></label>
<input type="text"
class="form-control" name="address"
id="address" readonly="readonly"
maxlength="50" placeholder="收货地址"
value="$!{data.address}"
>
<label>订单状态<font style="color: red"></font></label>
<input type="text"
class="form-control" name="payStatus"
id="payStatus" readonly="readonly"
maxlength="50" placeholder=""
value="$!{data.payStatus}"
>
<label>支付备注<font style="color: red"></font></label>
<input type="text"
class="form-control" name="description"
id="description" readonly="readonly"
maxlength="50" placeholder=""
value="$!{data.description}"
>
<label>支付交易号<font style="color: red"></font></label>
<input type="text"
class="form-control" name="tradeNo"
id="tradeNo" readonly="readonly"
maxlength="50" placeholder=""
value="$!{data.tradeNo}"
>
<label>创建时间<font style="color: red"></font></label>
<input type="text"
class="form-control" name="createTime"
id="createTime" readonly="readonly"
maxlength="50" placeholder=""
value="$!{data.createTime}"
>
<div id="divClass">
<label>订单取消原因<font style="color: red"></font></label>
<input type="text"
class="form-control" name="orderCancel"
id="orderCancel" readonly="readonly"
maxlength="50" placeholder=""
value="$!{data.orderCancel}"
>
</div>
<div/>
<div class="box-footer"> <div class="panel panel-primary">
#if($shiro.hasPermission("qy:order:edit")) <div class="panel-heading">商品信息</div>
<button class="btn btn-primary" onclick="save()">保存</button> <div class="panel-body">
#end <div class="form-group form-md-line-input">
<a href="#springUrl('/a/order/list')" class="btn btn-default">取消</a> <div id="group" class="list-group">
<li class="list-group-item">
<th style=""><label style="width: 180px;margin-right: 50px;text-align: center">商品名称</label></th>
<th style=""><label style="width: 180px;margin-right: 50px;text-align: center">商品购买数量</label> </th>
<th style=""><label style="width: 160px;margin-right: 50px;text-align: center">商品单价</label></th>
<th style=""><label style="width: 180px;margin-right: 50px;text-align: center">商品总价</label></th>
</li>
</div>
<button type="button" class="search btn btn-primary" onclick="clickAdd()">添加商品</button>
</div>
</div> </div>
</div> </div>
<div class="box-footer">
#if($shiro.hasPermission("qy:order:edit"))
<button class="btn btn-primary" onclick="save()">保存</button>
#end
<a href="#springUrl('/a/order/list')" class="btn btn-default">取消</a>
</div>
<!--</form>--> <!--</form>-->
<!-- /.box-body --> <!-- /.box-body -->
</div><!-- /.box --> </div><!-- /.box -->
</div>
</div><!-- /.col --> </div><!-- /.col -->
</div><!-- /.row --> </div><!-- /.row -->
</section><!-- /.content --> </section><!-- /.content -->
...@@ -196,6 +208,8 @@ ...@@ -196,6 +208,8 @@
<script src="plugins/jQuery/jQuery-2.1.4.min.js"></script> <script src="plugins/jQuery/jQuery-2.1.4.min.js"></script>
<!-- Bootstrap 3.3.5 --> <!-- Bootstrap 3.3.5 -->
<script src="bootstrap/js/bootstrap.min.js"></script> <script src="bootstrap/js/bootstrap.min.js"></script>
<script src="plugins/select2/select2.full.min.js"></script>
<!-- DataTables --> <!-- DataTables -->
<script src="plugins/datatables/jquery.dataTables.min.js"></script> <script src="plugins/datatables/jquery.dataTables.min.js"></script>
<script src="plugins/datatables/extensions/i18n/lanauage_ch.js"></script> <script src="plugins/datatables/extensions/i18n/lanauage_ch.js"></script>
...@@ -218,7 +232,7 @@ ...@@ -218,7 +232,7 @@
<script src="common/js/cfapp.js"></script> <script src="common/js/cfapp.js"></script>
<!-- END PAGE LEVEL PLUGINS --> <!-- END PAGE LEVEL PLUGINS -->
<script> <script>
var csrf='${_csrf.token}'; var csrf='${_csrf.token}';
var csrf_header='${_csrf.headerName}'; var csrf_header='${_csrf.headerName}';
var areaList = []; var areaList = [];
...@@ -244,7 +258,7 @@ ...@@ -244,7 +258,7 @@
// if($(this).val() == obj.provinceId){ // if($(this).val() == obj.provinceId){
// $(this).attr('selected', 'selected'); // $(this).attr('selected', 'selected');
// } // }
clickAdd(obj.id,obj.productId, obj.drugsNum, obj.price, obj.amount); clickAdd(obj.id, obj.productId, obj.drugsNum, obj.price, obj.amount);
} }
} }
// $('#selectProduct option').each(function () { // $('#selectProduct option').each(function () {
...@@ -299,7 +313,7 @@ ...@@ -299,7 +313,7 @@
}); });
function clickAdd(id,productId, count, price, amount) { function clickAdd(id, productId, count, price, amount) {
var options = areaList.map(function (item) { var options = areaList.map(function (item) {
if (productId && productId != null && item.id === productId) { if (productId && productId != null && item.id === productId) {
return `<option selected value="${item.id}" data-price="${item.price}">${item.productName}</option>` return `<option selected value="${item.id}" data-price="${item.price}">${item.productName}</option>`
...@@ -310,65 +324,66 @@ ...@@ -310,65 +324,66 @@
var idHtml = ""; var idHtml = "";
if (id && id != null){ if (id && id != null){
idHtml +=`<input type="hidden" name="idDetail" value="${id}">` idHtml +=`<input type="hidden" name="idDetail" value="${id}">`
}else{ }else{
idHtml +=`<input type="hidden" name="idDetail" value="">` idHtml +=`<input type="hidden" name="idDetail" value="">`
} }
var listHtml = ""; var listHtml = "";
if (count && count != null) { if (count && count != null) {
price price
listHtml += `<input name="listHtml" type='number' style="width: 180px;margin-right: 80px" oninput="if(value>100)value=100;if(value.length>2)value=value.slice(0,2);if(value<=0)value=1" onchange="updateCount(this)" value=${count} ></input>`; listHtml += `<input name="listHtml" class="form-control" type='number' style="width: 180px;margin-right: 50px; margin-left: 50px;" oninput="if(value>100)value=100;if(value.length>2)value=value.slice(0,2);if(value<=0)value=1" onchange="updateCount(this)" value=${count} ></input>`;
} else { } else {
listHtml += `<input name="listHtml" type='number' style="width: 180px ;margin-right: 80px" oninput="if(value>100)value=100;if(value.length>2)value=value.slice(0,2);if(value<=0)value=1" onchange="updateCount(this)" value="1"></input>`; listHtml += `<input name="listHtml" class="form-control" type='number' style="width: 180px ;margin-right: 50px; margin-left: 50px;" oninput="if(value>100)value=100;if(value.length>2)value=value.slice(0,2);if(value<=0)value=1" onchange="updateCount(this)" value="1"></input>`;
} }
var HtmlPrice = ""; var HtmlPrice = "";
if (price && price != null) { if (price && price != null) {
HtmlPrice += `<input name="htmlPrice" style="width: 180px ;margin-right: 80px" type='text' readonly="readonly" value="`+price.toFixed(2)+`"></input>`; HtmlPrice += `<input name="htmlPrice" class="form-control" style="width: 180px ;margin-right: 50px" type='text' readonly="readonly" value="`+price.toFixed(2)+`"></input>`;
} else { } else {
// var item = areaList.find(item => item.id === id)
var item = areaList[0] var item = areaList[0]
priveTmp = item.price.toFixed(2) priveTmp = item.price.toFixed(2)
HtmlPrice += `<input name="htmlPrice" data-price="${item.id}" style="width: 180px ;margin-right: 80px" type="text" readonly="readonly" value="${priveTmp}"></input>` HtmlPrice += `<input name="htmlPrice" class="form-control" data-price="${item.id}" style="width: 180px ;margin-right: 50px" type="text" readonly="readonly" value="${priveTmp}"></input>`
} }
var HtmlAmount = ""; var HtmlAmount = "";
if (amount && amount != null) { if (amount && amount != null) {
// var amout = ${amount}; // var amout = ${amount};
HtmlAmount += `<input id="htmlAmount" name="htmlAmount" style="width: 180px ;margin-right: 80px" type='text' readonly="readonly" value="`+amount .toFixed(2)+`" ></input>`; HtmlAmount += `<input id="htmlAmount" class="form-control" name="htmlAmount" style="width: 180px ;margin-right: 50px" type='text' readonly="readonly" value="`+amount .toFixed(2)+`" ></input>`;
} else { } else {
// var item = areaList.find(item => item.id === id)
var countSi = 1; var countSi = 1;
var amountPrice = countSi * item.price var amountPrice = countSi * item.price
var amountTmp = amountPrice.toFixed(2) var amountTmp = amountPrice.toFixed(2)
var item = areaList[0] var item = areaList[0]
HtmlAmount += `<input id="htmlAmount" name="htmlAmount" data-price="${item.id}" style="width: 180px ;margin-right: 80px" type="text" readonly="readonly" value="${amountTmp}"></input>` HtmlAmount += `<input id="htmlAmount" class="form-control" name="htmlAmount" data-price="${item.id}" style="width: 180px;margin-right: 50px" type="text" readonly="readonly" value="${amountTmp}"></input>`
} }
let html = `<div id="form-translate" class="translate" style="display: flex ;margin-bottom: 30px"> let html = `<li id="form-translate" class="list-group-item" style="display:flex ;">
${idHtml} ${idHtml}
<select class="form-control" name="releas" style="width: 180px ;margin-right: 80px" onchange="getPrice(this)"> <select class="form-control select2 releas" name="releas" style="width: 180px;" onchange="getPrice(this)">
${options} ${options}
</select> </select>
${listHtml} ${listHtml}
${HtmlPrice} ${HtmlPrice}
${HtmlAmount} ${HtmlAmount}
<button type="button" class="search btn btn-primary" style="background-color: #d73925 ;" onclick="deleteSelect(event)">删除
<button type="button" class="search btn btn-primary" style="background-color: #d73925 ;margin-left: 200px" onclick="deleteSelect(event)">删除 </button>
</button> </li>`;
</div>`
$("#group").append(html); $("#group").append(html);
initSelect2();
toTal() toTal()
} }
function initSelect2() {
$('.releas').select2({
placeholder: '选择商品'
});
}
function getPrice(e) { function getPrice(e) {
let price = $(e).find("option:selected").attr('data-price'); let price = $(e).find("option:selected").attr('data-price');
//let price = $(e).parent().find('input[name="htmlPrice"]').attr("target-data"); //let price = $(e).parent().find('input[name="htmlPrice"]').attr("target-data");
......
aidea-modules/order-module-web/src/main/webapp/WEB-INF/views/order/orderlist.html
View file @ da850ac0
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
<div class="col-xs-2"> <div class="col-xs-2">
<input type="text" class="form-control " <input type="text" class="form-control "
name="orderCode" placeholder="订单编号"> name="number" placeholder="订单编号">
</div> </div>
<div class="col-xs-2"> <div class="col-xs-2">
<input type="text" class="form-control " <input type="text" class="form-control "
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
<th>订单编码</th> <th>订单编码</th>
<th>产品名称</th> <th>产品名称</th>
<th>订单金额</th> <th>订单金额</th>
<th>订单总价</th> <th>付款金额</th>
<th>收货地址</th> <th>收货地址</th>
<th>快递单号</th> <th>快递单号</th>
<th>订单状态</th> <th>订单状态</th>
...@@ -209,19 +209,17 @@ ...@@ -209,19 +209,17 @@
"mData": "id" "mData": "id"
}, },
{ {
"mData": "orderCode" "mData": "number"
}, },
{ {
"mData": "productName" "mData": "productName"
} },
,
{ {
"mData": "payAmount" "mData": "orderAmount"
} }
, ,
{ {
"mData": "orderAmount" "mData": "totalAmount"
} }
, ,
{ {
...@@ -261,7 +259,7 @@ ...@@ -261,7 +259,7 @@
}, },
{ {
"aTargets": [1], "aTargets": [1],
"mData": "orderCode", "mData": "number",
"mRender": function (a, b, c, d) { "mRender": function (a, b, c, d) {
return a; return a;
} }
...@@ -277,7 +275,7 @@ ...@@ -277,7 +275,7 @@
, ,
{ {
"aTargets": [3], "aTargets": [3],
"mData": "payAmount", "mData": "orderAmount",
"mRender": function (a, b, c, d) { "mRender": function (a, b, c, d) {
return a; return a;
} }
...@@ -285,7 +283,7 @@ ...@@ -285,7 +283,7 @@
, ,
{ {
"aTargets": [4], "aTargets": [4],
"mData": "orderAmount", "mData": "totalAmount",
"mRender": function (a, b, c, d) { "mRender": function (a, b, c, d) {
return a; return a;
} }
...@@ -359,6 +357,7 @@ ...@@ -359,6 +357,7 @@
'</button>\n' + '</button>\n' +
'<ul class="dropdown-menu" role="menu">\n'; '<ul class="dropdown-menu" role="menu">\n';
html += '<li><a href="#springUrl("/a/order/form?id=' + a + '")">查看</a></li>'; html += '<li><a href="#springUrl("/a/order/form?id=' + a + '")">查看</a></li>';
html += '<li><a href="#springUrl("/a/order/sendOut?id=' + a + '")">订单出库</a></li>';
html += '</ul>'; html += '</ul>';
html += '#end'; html += '#end';
return html; return html;
......
aidea-modules/order-module/src/main/java/com/cftech/order/dao/OrderMapper.xml
View file @ da850ac0
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
<resultMap id="resultMap" type="com.cftech.order.model.Order"> <resultMap id="resultMap" type="com.cftech.order.model.Order">
<id column="id" property="id"/> <id column="id" property="id"/>
<result column="order_code" property="orderCode"/>
<result column="consult_id" property="consultId"/> <result column="consult_id" property="consultId"/>
<result column="number" property="number"/> <result column="number" property="number"/>
<result column="member_id" property="memberId"/> <result column="member_id" property="memberId"/>
...@@ -38,7 +37,6 @@ ...@@ -38,7 +37,6 @@
<resultMap id="resultMapList" type="com.cftech.order.model.Order"> <resultMap id="resultMapList" type="com.cftech.order.model.Order">
<id column="id" property="id"/> <id column="id" property="id"/>
<result column="order_code" property="orderCode"/>
<result column="consult_id" property="consultId"/> <result column="consult_id" property="consultId"/>
<result column="number" property="number"/> <result column="number" property="number"/>
<result column="member_id" property="memberId"/> <result column="member_id" property="memberId"/>
...@@ -101,32 +99,30 @@ ...@@ -101,32 +99,30 @@
</sql> </sql>
<sql id="sqlColumns"> <sql id="sqlColumns">
o.id, o.id,
o.order_code, t.product_number,
t.product_number, o.consult_id,
o.consult_id, t.product_name,
t.product_name, o.number,
o.number, o.pay_amount,
o.pay_amount, o.order_amount,
o.order_amount, o.total_amount,
o.pay_status, o.pay_status,
o.order_cancel, o.order_cancel,
o.trade_no, o.trade_no,
o.description, o.description,
o.STATUS, o.STATUS,
o.create_time, o.create_time,
o.update_time, o.update_time,
o.confirm, o.confirm,
d.drugs_num, d.drugs_num,
o.courier_number, o.courier_number,
CONCAT(a.areaname, CONCAT(a.areaname, b.areaname, c.areaname,s.address) as address,
b.areaname, t.id as productId
c.areaname,s.address) as address, </sql>
t.id as productId
</sql>
<sql id="sqlColumnFrom"> <sql id="sqlColumnFrom">
o.id, o.id,
o.order_code AS orderCode,
o.consult_id AS consultId, o.consult_id AS consultId,
o.number, o.number,
o.pay_amount AS payAmount, o.pay_amount AS payAmount,
...@@ -140,7 +136,7 @@ ...@@ -140,7 +136,7 @@
o.confirm, o.confirm,
o.courier_number AS courierNumber, o.courier_number AS courierNumber,
CONCAT( a.areaname, b.areaname, c.areaname, s.address ) AS address CONCAT( a.areaname, b.areaname, c.areaname, s.address ) AS address
</sql> </sql>
<sql id="sqlColumnProduct"> <sql id="sqlColumnProduct">
d.id, d.id,
d.order_id, d.order_id,
...@@ -150,21 +146,19 @@ ...@@ -150,21 +146,19 @@
d.drugs_num AS drugsNum, d.drugs_num AS drugsNum,
d.price, d.price,
d.amount d.amount
</sql> </sql>
<sql id="Column"> <sql id="Column">
order_id, order_id,
order_code, drugs_id,
drugs_id, drugs_num,
drugs_num, openid,
openid, price,
price, amount,
amount, drugs_code,
drugs_code, drugs_sku,
drugs_sku, accounts_id
accounts_id </sql>
</sql>
<insert id="save" parameterType="com.cftech.order.model.Order" useGeneratedKeys="true" <insert id="save" parameterType="com.cftech.order.model.Order" useGeneratedKeys="true"
...@@ -195,7 +189,6 @@ ...@@ -195,7 +189,6 @@
#{status, jdbcType=VARCHAR}, #{status, jdbcType=VARCHAR},
now(), now(),
now() now()
) )
</insert> </insert>
...@@ -249,13 +242,13 @@ ...@@ -249,13 +242,13 @@
LEFT JOIN area c ON s.area_id = c.areaid LEFT JOIN area c ON s.area_id = c.areaid
LEFT JOIN t_qyuser q ON o.service_id = q.id AND o.doctor_id = q.id LEFT JOIN t_qyuser q ON o.service_id = q.id AND o.doctor_id = q.id
<include refid="sqlWhere"/> <include refid="sqlWhere"/>
<if test="id!=null">and(o.service_id = ${id} or o.doctor_id =${id} or o.clerk_id = ${id}) </if> <if test="id!=null">and(o.service_id = ${id} or o.doctor_id =${id} or o.clerk_id = ${id})</if>
<if test="sort!=null">ORDER BY ${sort.param} ${sort.type}</if> <if test="sort!=null">ORDER BY ${sort.param} ${sort.type}</if>
<if test="limit>0">limit #{offset},#{limit}</if> <if test="limit>0">limit #{offset},#{limit}</if>
</select> </select>
<select id="listProduct" resultType="com.cftech.order.model.ProductOrder"> <select id="listProduct" resultType="com.cftech.order.model.ProductOrder">
SELECT id,product_name as productName,price FROM t_aidea_product SELECT id, product_name as productName,price FROM t_aidea_product
</select> </select>
<update id="update" parameterType="com.cftech.order.model.Order"> <update id="update" parameterType="com.cftech.order.model.Order">
update t_order update t_order
...@@ -342,7 +335,7 @@ ...@@ -342,7 +335,7 @@
<select id="fetcheDeta" parameterType="java.util.Map" resultType="java.lang.Integer"> <select id="fetcheDeta" parameterType="java.util.Map" resultType="java.lang.Integer">
select * from t_order_details where order_id =#{id} and accounts_id=#{accountsId} and drugs_id =#{productId} select * from t_order_details where order_id =#{id} and accounts_id=#{accountsId} and drugs_id =#{productId}
</select> </select>
<insert id="saveDetill" parameterType="com.cftech.order.model.OrderDetailDto" > <insert id="saveDetill" parameterType="com.cftech.order.model.OrderDetailDto">
insert into t_order_details insert into t_order_details
( (
<include refid="Column"/> <include refid="Column"/>
...@@ -350,7 +343,6 @@ ...@@ -350,7 +343,6 @@
values values
( (
#{orderId}, #{orderId},
#{orderCode},
#{drugsId}, #{drugsId},
#{drugsNum}, #{drugsNum},
#{openid}, #{openid},
......
aidea-modules/order-module/src/main/java/com/cftech/order/model/Order.java
View file @ da850ac0
...@@ -16,19 +16,15 @@ import java.util.stream.Collectors; ...@@ -16,19 +16,15 @@ import java.util.stream.Collectors;
* @author Licc * @author Licc
* @date: 2020-10-10 14:20 * @date: 2020-10-10 14:20
*/ */
public class Order extends OrderDetail implements Serializable { public class Order extends OrderDetail implements Serializable {
/* 主键id */ /* 主键id */
private Long id; private Long id;
/* 订单编码 */
@ExportConfig(value = "订单编码", width = 100, showLevel = 1)
private String orderCode;
/* 咨询单id */ /* 咨询单id */
@ExportConfig(value = "咨询单id", width = 100, showLevel = 1) @ExportConfig(value = "咨询单id", width = 100, showLevel = 1)
private Long consultId; private Long consultId;
/* 咨询单编码 */ /* 订单编码 */
@ExportConfig(value = "咨询单编码", width = 100, showLevel = 1) @ExportConfig(value = "订单编码", width = 100, showLevel = 1)
private String number; private String number;
/* 所属会员id */ /* 所属会员id */
@ExportConfig(value = "所属会员id", width = 100, showLevel = 1) @ExportConfig(value = "所属会员id", width = 100, showLevel = 1)
...@@ -114,16 +110,6 @@ public class Order extends OrderDetail implements Serializable { ...@@ -114,16 +110,6 @@ public class Order extends OrderDetail implements Serializable {
this.id = id; this.id = id;
} }
@Override
public String getOrderCode() {
return orderCode;
}
@Override
public void setOrderCode(String orderCode) {
this.orderCode = orderCode;
}
public Long getConsultId() { public Long getConsultId() {
return consultId; return consultId;
} }
......
aidea-modules/order-module/src/main/java/com/cftech/order/model/OrderDetail.java
View file @ da850ac0
...@@ -20,9 +20,6 @@ public class OrderDetail implements Serializable { ...@@ -20,9 +20,6 @@ public class OrderDetail implements Serializable {
/* 订单id */ /* 订单id */
@ExportConfig(value = "订单id", width = 100, showLevel = 1) @ExportConfig(value = "订单id", width = 100, showLevel = 1)
private Long orderId; private Long orderId;
/* 订单编码 */
@ExportConfig(value = "订单编码", width = 100, showLevel = 1)
private String orderCode;
/* 商品id */ /* 商品id */
@ExportConfig(value = "商品id", width = 100, showLevel = 1) @ExportConfig(value = "商品id", width = 100, showLevel = 1)
private Long drugsId; private Long drugsId;
......
aidea-modules/order-module/src/main/java/com/cftech/order/model/OrderDetailDto.java
View file @ da850ac0
...@@ -11,8 +11,6 @@ import lombok.Data; ...@@ -11,8 +11,6 @@ import lombok.Data;
public class OrderDetailDto { public class OrderDetailDto {
/* 订单id */ /* 订单id */
private Long orderId; private Long orderId;
/* 订单编码 */
private String orderCode;
/* 商品id */ /* 商品id */
private Long drugsId; private Long drugsId;
private Long drugsNum; private Long drugsNum;
......
aidea-modules/order-module/src/main/java/com/cftech/order/model/OrderFromVO.java
View file @ da850ac0
...@@ -13,9 +13,10 @@ import java.util.Date; ...@@ -13,9 +13,10 @@ import java.util.Date;
@Data @Data
public class OrderFromVO { public class OrderFromVO {
private Long id; private Long id;
private String orderCode; private String number;
private String courierNumber; private String courierNumber;
private String productNumber; private String productNumber;
private String productName;
private Long productId; private Long productId;
private Long drugsNum; private Long drugsNum;
private double orderAmount; private double orderAmount;
......
aidea-modules/order-module/src/main/java/com/cftech/order/model/OrderVO.java
View file @ da850ac0
...@@ -12,9 +12,6 @@ import java.util.Date; ...@@ -12,9 +12,6 @@ import java.util.Date;
*/ */
@Data @Data
public class OrderVO { public class OrderVO {
/* 订单编码 */
@ExportConfig(value = "订单编码", width = 100, showLevel = 1)
private String orderCode;
/* 产品编码 */ /* 产品编码 */
@ExportConfig(value = "商品编码",width = 100,showLevel = 1) @ExportConfig(value = "商品编码",width = 100,showLevel = 1)
private String productNumber; private String productNumber;
......
aidea-modules/order-module/src/main/java/com/cftech/order/service/impl/OrderServiceImpl.java
View file @ da850ac0
...@@ -106,7 +106,6 @@ public class OrderServiceImpl extends GenericServiceImpl<Order> implements Order ...@@ -106,7 +106,6 @@ public class OrderServiceImpl extends GenericServiceImpl<Order> implements Order
orderDetailDto = new OrderDetailDto(); orderDetailDto = new OrderDetailDto();
Order orders = orderMapper.fetchOrder(id); Order orders = orderMapper.fetchOrder(id);
orderDetailDto.setOrderId(id); orderDetailDto.setOrderId(id);
orderDetailDto.setOrderCode(orders.getOrderCode());
orderDetailDto.setDrugsId(productDtos.getId()); orderDetailDto.setDrugsId(productDtos.getId());
orderDetailDto.setOpenid(orders.getOpenid()); orderDetailDto.setOpenid(orders.getOpenid());
orderDetailDto.setPrice(productDtos.getPrice()); orderDetailDto.setPrice(productDtos.getPrice());
......
aidea-modules/order-module/src/main/java/com/cftech/order/web/OrderController.java
View file @ da850ac0
package com.cftech.order.web; package com.cftech.order.web;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONAware;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature; import com.alibaba.fastjson.serializer.SerializerFeature;
import com.cftech.order.model.Order; import com.cftech.order.model.Order;
...@@ -17,12 +16,11 @@ import com.cftech.core.util.Constants; ...@@ -17,12 +16,11 @@ import com.cftech.core.util.Constants;
import com.cftech.order.utils.DoubleJSONFilter; import com.cftech.order.utils.DoubleJSONFilter;
import com.cftech.sys.security.UserUtils; import com.cftech.sys.security.UserUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.sf.json.JSONArray; import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
...@@ -73,22 +71,38 @@ public class OrderController { ...@@ -73,22 +71,38 @@ public class OrderController {
@RequestMapping("/form") @RequestMapping("/form")
public String form(HttpServletRequest request, String id, Model model) { public String form(HttpServletRequest request, String id, Model model) {
if (!StringUtils.isEmpty(id)) { if (!StringUtils.isEmpty(id)) {
OrderFromVO orderFromVO = orderService.fetchId(id); OrderFromVO orderFromVO = orderService.fetchId(id);
List<OrderFromVO> fromVO = orderService.fetchProductId(id); List<OrderFromVO> fromVO = orderService.fetchProductId(id);
JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(orderFromVO)); JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(orderFromVO));
String jsonArray = JSON.toJSONString(fromVO, DOUBLE_JSON_FILTER ,SerializerFeature.WriteMapNullValue); String jsonArray = JSON.toJSONString(fromVO, DOUBLE_JSON_FILTER, SerializerFeature.WriteMapNullValue);
model.addAttribute("data", jsonObject); model.addAttribute("data", jsonObject);
model.addAttribute("list", jsonArray); model.addAttribute("list", jsonArray);
} }
return "order/orderform"; return "order/orderform";
} }
//订单出货页面
@RequiresPermissions(value = ORDER_VIEW)
@RequestMapping("/sendOut")
public String sendOut(HttpServletRequest request, String id, Model model) {
if (StringUtils.isNoneBlank(id)) {
OrderFromVO orderFromVO = orderService.fetchId(id);
List<OrderFromVO> fromVO = orderService.fetchProductId(id);
JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(orderFromVO));
String jsonArray = JSON.toJSONString(fromVO, DOUBLE_JSON_FILTER, SerializerFeature.WriteMapNullValue);
model.addAttribute("data", jsonObject);
model.addAttribute("list", jsonArray);
}
return "order/orderSendOut";
}
@RequestMapping("/fromProduct") @RequestMapping("/fromProduct")
@ResponseBody @ResponseBody
public JSONObject fromProduct(){ public JSONObject fromProduct() {
List<ProductOrder> orders = orderService.listProduct(); List<ProductOrder> orders = orderService.listProduct();
String jsonArray = JSON.toJSONString(orders, DOUBLE_JSON_FILTER ,SerializerFeature.WriteMapNullValue); String jsonArray = JSON.toJSONString(orders, DOUBLE_JSON_FILTER, SerializerFeature.WriteMapNullValue);
JSONObject object = new JSONObject(); JSONObject object = new JSONObject();
object.put("data",jsonArray); object.put("data", jsonArray);
return object; return object;
} }
...@@ -97,7 +111,7 @@ public class OrderController { ...@@ -97,7 +111,7 @@ public class OrderController {
@RequiresPermissions(value = ORDER_EDIT) @RequiresPermissions(value = ORDER_EDIT)
@PostMapping(value = "/formData", produces = {"application/json;charset=utf-8"}) @PostMapping(value = "/formData", produces = {"application/json;charset=utf-8"})
@ResponseBody @ResponseBody
public JSONObject formData(HttpServletRequest request,String datas) { public JSONObject formData(HttpServletRequest request, String datas) {
Long accountsId = UserUtils.getmpaccounts(request); Long accountsId = UserUtils.getmpaccounts(request);
JSONObject jsonObject = orderService.newlyAdded(datas, accountsId); JSONObject jsonObject = orderService.newlyAdded(datas, accountsId);
return jsonObject; return jsonObject;
...@@ -114,14 +128,14 @@ public class OrderController { ...@@ -114,14 +128,14 @@ public class OrderController {
conds.equal("o.del_flag", Constants.DEL_FLAG_0); conds.equal("o.del_flag", Constants.DEL_FLAG_0);
conds.equal("o.accounts_id", accountsId); conds.equal("o.accounts_id", accountsId);
Sort sort = new Sort("o.create_time", OrderType.DESC); Sort sort = new Sort("o.create_time", OrderType.DESC);
if(!StringUtils.isEmpty(order.getOrderCode())){ if (!StringUtils.isEmpty(order.getNumber())) {
conds.like("o.order_code",order.getOrderCode()) ; conds.like("o.order_code", order.getNumber());
} }
if (!StringUtils.isEmpty(order.getProductName())){ if (!StringUtils.isEmpty(order.getProductName())) {
conds.like("t.product_name",order.getProductName()); conds.like("t.product_name", order.getProductName());
} }
List<Order> list = orderService.fetchSearchBy(conds, sort, iDisplayStart, iDisplayLength,id); List<Order> list = orderService.fetchSearchBy(conds, sort, iDisplayStart, iDisplayLength, id);
Integer counts = orderService.count(conds); Integer counts = orderService.count(conds);
JSONObject rtnJson = new JSONObject(); JSONObject rtnJson = new JSONObject();
rtnJson.put("iTotalRecords", counts); rtnJson.put("iTotalRecords", counts);
...@@ -156,9 +170,8 @@ public class OrderController { ...@@ -156,9 +170,8 @@ public class OrderController {
List<Order> list = orderService.fetchSearchByPage(conds, sort, 0, 0); List<Order> list = orderService.fetchSearchByPage(conds, sort, 0, 0);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
LinkedList<OrderVO> orderVOS = new LinkedList<>(); LinkedList<OrderVO> orderVOS = new LinkedList<>();
for(Order order :list){ for (Order order : list) {
OrderVO orderVO = new OrderVO(); OrderVO orderVO = new OrderVO();
orderVO.setOrderCode(order.getOrderCode());
orderVO.setProductNumber(order.getProductNumber()); orderVO.setProductNumber(order.getProductNumber());
orderVO.setProductName(order.getProductName()); orderVO.setProductName(order.getProductName());
orderVO.setOrderAmount(order.getOrderAmount()); orderVO.setOrderAmount(order.getOrderAmount());
...@@ -185,7 +198,7 @@ public class OrderController { ...@@ -185,7 +198,7 @@ public class OrderController {
if (file == null) { if (file == null) {
return list(request, model); return list(request, model);
} }
// 构造临时路径来存储上传的文件 // 构造临时路径来存储上传的文件
String uploadPath = System.getProperty("java.io.tmpdir"); String uploadPath = System.getProperty("java.io.tmpdir");
File uploadDir = new File(uploadPath); File uploadDir = new File(uploadPath);
if (!uploadDir.exists()) { if (!uploadDir.exists()) {
......
aidea-modules/product-module-web/src/main/webapp/WEB-INF/views/product/productform.html
View file @ da850ac0
...@@ -320,7 +320,7 @@ ...@@ -320,7 +320,7 @@
$("#columnSelect").click(function () { $("#columnSelect").click(function () {
Cfapp.f7({ Cfapp.f7({
dataUrl: classify, dataUrl: classify,
checkType: 'single', // 多选为multi checkType: 'multi', // 多选为multi
title: "选择产品分类", title: "选择产品分类",
btnoktext: "确定", btnoktext: "确定",
btncanceltext: "取消", btncanceltext: "取消",
......
cftech-common-web/src/main/resources/redis-config-test.properties
View file @ da850ac0
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09 # Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
spring.redis.database=15 spring.redis.database=15
# Redis\u670D\u52A1\u5668\u5730\u5740 # Redis\u670D\u52A1\u5668\u5730\u5740
spring.redis.host=211.159.220.36 spring.redis.host=r-uf6ofe37sshorzyjw1pd.redis.rds.aliyuncs.com
#spring.redis.host=127.0.0.1 #spring.redis.host=127.0.0.1
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
spring.redis.port=6379 spring.redis.port=6379
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
spring.redis.password=kqBfJ/3Z9sQe2GNhYe4lLQ== spring.redis.password=XR123456xr
#spring.redis.password=fyJIAJk9NqYWHoG7Eu+1vg== #spring.redis.password=fyJIAJk9NqYWHoG7Eu+1vg==
# \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09 # \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
spring.redis.pool.max-active=8 spring.redis.pool.max-active=8
......
sys-module-web/src/main/webapp/WEB-INF/views/manageuser/userupdate.html
View file @ da850ac0
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
<table id="table" class="table"> <table id="table" class="table">
<thead> <thead>
<tr> <tr>
<th style="width:15%;"><label>公众号</label></th> <!--<th style="width:15%;"><label>公众号</label></th>-->
<th style="width:45%;"><label>角色</label></th> <th style="width:45%;"><label>角色</label></th>
<th style="width:30%;"></th> <th style="width:30%;"></th>
</tr> </tr>
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<button type="button" class="btn btn-info" id="addAccounts">添加公众号</button> <!--<button type="button" class="btn btn-info" id="addAccounts">添加公众号</button>-->
</div> </div>
<div class="box-footer"> <div class="box-footer">
<input class="btn btn-primary" id="save" type="submit" value="保存"> <input class="btn btn-primary" id="save" type="submit" value="保存">
...@@ -306,9 +306,9 @@ ...@@ -306,9 +306,9 @@
var rolehtml = $(".role").html(); var rolehtml = $(".role").html();
var html = ""; var html = "";
html += "<tr class='trEle'>"; html += "<tr class='trEle'>";
html += "<td>"; // html += "<td>";
html += "<select class='form-control select2 account' data-placeholder='请选择公众号'>" + accounthtml; // html += "<select class='form-control select2 account' data-placeholder='请选择公众号'>" + accounthtml;
html += "</select></td>"; // html += "</select></td>";
html += "<td>"; html += "<td>";
html += "<select class='form-control select2 role' style='width:100%;' multiple='multiple' data-placeholder='请选择角色'>"; html += "<select class='form-control select2 role' style='width:100%;' multiple='multiple' data-placeholder='请选择角色'>";
html += rolehtml; html += rolehtml;
...@@ -338,9 +338,9 @@ ...@@ -338,9 +338,9 @@
var rolehtml = $(".qyrole").html(); var rolehtml = $(".qyrole").html();
var html = ""; var html = "";
html += "<tr class='trEle'>"; html += "<tr class='trEle'>";
html += "<td>"; // html += "<td>";
html += "<select class='form-control select2 qyaccount' data-placeholder='请选择公众号'>" + accounthtml; // html += "<select class='form-control select2 qyaccount' data-placeholder='请选择公众号'>" + accounthtml;
html += "</select></td>"; // html += "</select></td>";
html += "<td>"; html += "<td>";
html += "<select class='form-control select2 qyrole' style='width:100%;' multiple='multiple' data-placeholder='请选择角色'>"; html += "<select class='form-control select2 qyrole' style='width:100%;' multiple='multiple' data-placeholder='请选择角色'>";
html += rolehtml; html += rolehtml;
...@@ -392,9 +392,9 @@ ...@@ -392,9 +392,9 @@
var rolehtml = $(".role").html(); var rolehtml = $(".role").html();
var html = ""; var html = "";
html += "<tr class='trEle'>"; html += "<tr class='trEle'>";
html += "<td>"; // html += "<td>";
html += "<select class='form-control select2 account' data-placeholder='请选择公众号'>" + accounthtml; // html += "<select class='form-control select2 account' data-placeholder='请选择公众号'>" + accounthtml;
html += "</select></td>"; // html += "</select></td>";
html += "<td>"; html += "<td>";
html += "<select class='form-control select2 role' style='width:100%;' multiple='multiple' data-placeholder='请选择角色'>"; html += "<select class='form-control select2 role' style='width:100%;' multiple='multiple' data-placeholder='请选择角色'>";
html += rolehtml; html += rolehtml;
...@@ -415,10 +415,10 @@ ...@@ -415,10 +415,10 @@
var rolehtml = $(".qyrole").html(); var rolehtml = $(".qyrole").html();
var html = ""; var html = "";
html += "<tr class='trEle'>"; html += "<tr class='trEle'>";
html += "<td>"; // html += "<td>";
html += "<select class='form-control select2 qyaccount' data-placeholder='请选择企业号'>" + accounthtml; // html += "<select class='form-control select2 qyaccount' data-placeholder='请选择企业号'>" + accounthtml;
html += "</select></td>"; // html += "</select></td>";
html += "<td>"; // html += "<td>";
html += "<select class='form-control select2 qyrole' style='width:100%;' multiple='multiple' data-placeholder='请选择角色'>"; html += "<select class='form-control select2 qyrole' style='width:100%;' multiple='multiple' data-placeholder='请选择角色'>";
html += rolehtml; html += rolehtml;
html += '</select></td>' + html += '</select></td>' +
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment