Skip to content

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

Aidea product update by Strive Date 2020-11-23

parent 78580db4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 282 additions and 208 deletions
aidea-modules/consult-module-web/src/main/webapp/WEB-INF/views/consultSheet/consultSheetform.html
View file @ 860d3141
......@@ -192,24 +192,41 @@
<div class="form-group form-md-line-input col-md-3">
<label>处方医院</label>
#if ($!{isView} == 'true')
<input type="text"
class="form-control" value="$!{data.hospital}"
readonly="readonly"
maxlength="50" placeholder="处方医院" />
#else
<div class="input-group">
<input type="text" name="allergy" id="allergy" value="$!{data.allergy}" class="form-control" style="display: none">
<input type="text" id="hospital" name="hospital" value="$!{hospital}" class="form-control" disabled>
<input type="text" id="hospital" name="hospital" value="$!{data.hospital}" class="form-control" disabled>
<span class="input-group-btn">
<button type="button" name="selHospital" id="selHospital" class="btn btn-info btn-flat">选择</button>
</span>
</div>
#end
</div>
<div class="form-group form-md-line-input col-md-3">
<label>处方医生</label>
#if ($!{isView} == 'true')
<input type="text"
class="form-control" value="$!{data.pharmacist}"
readonly="readonly"
maxlength="50" placeholder="处方医生" />
#else
<div class="input-group">
<input type="text" name="pastRecords" id="pastRecords" value="$!{data.pastRecords}" class="form-control" style="display: none">
<input type="text" id="pharmacist" name="pharmacist" value="$!{pharmacist}" class="form-control" disabled>
<input type="text" id="pharmacist" name="pharmacist" value="$!{data.pharmacist}" class="form-control" disabled>
<span class="input-group-btn">
<button type="button" name="selDoctor" id="selDoctor" class="btn btn-info btn-flat">选择</button>
</span>
</div>
#end
</div>
<div class="form-group form-md-line-input col-xs-3">
......@@ -256,7 +273,9 @@
<th style=""><label style="width: 180px;margin-right: 50px;text-align: center">商品总价</label></th>
</li>
</div>
#if ($!{isView} != 'true')
<button type="button" class="search btn btn-primary" onclick="clickAdd()">添加商品</button>
#end
</div>
</div>
</div>
......@@ -320,6 +339,7 @@
<!-- END PAGE LEVEL PLUGINS -->
<script>
var isView = `$!{isView}`;
var goodsList = [];
function goodList() {
......@@ -329,16 +349,19 @@
type: "GET",
success: function (res) {
goodsList = JSON.parse(res.data);
// 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];
// clickAdd(obj.id, obj.productId, obj.drugsNum, obj.price, obj.amount);
// }
// }
if (isView == "true") {
let sheetGoods = `$!{data.symptom}`;
let consultId = $('#id').val();
if (sheetGoods != null && sheetGoods != '') {
let goodsArr = JSON.parse(sheetGoods);
if (goodsArr.length != 0) {
for (let i=0; i<goodsArr.length; i++) {
let goods = goodsArr[i];
clickAdd(consultId, goods.productId, goods.drugsNum, goods.price, goods.amount);
}
}
}
}
}
});
}
......@@ -361,14 +384,14 @@
var listHtml = "";
if (count && count != null) {
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>`;
listHtml += `<input name="listHtml" class="form-control" type='number' style="width: 180px;margin-right: 50px; margin-left: 50px;" readonly="readonly" 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 {
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 = "";
if (price && price != null) {
HtmlPrice += `<input name="htmlPrice" class="form-control" data-price="`+priceTmp+`" style="width: 180px ;margin-right: 50px" type='text' readonly="readonly" value="`+price.toFixed(2)+`"></input>`;
HtmlPrice += `<input name="htmlPrice" class="form-control" data-price="`+price+`" style="width: 180px ;margin-right: 50px" type='text' readonly="readonly" value="`+price+`"></input>`;
} else {
let priceTmp = goodsList[0].price.toFixed(2);
HtmlPrice += `<input name="htmlPrice" class="form-control" data-price="`+priceTmp+`" style="width: 180px ;margin-right: 50px" type="text" readonly="readonly" value="`+priceTmp+`"></input>`
......@@ -376,16 +399,19 @@
var HtmlAmount = "";
if (amount && amount != null) {
HtmlAmount += `<input id="htmlAmount" class="form-control" name="htmlAmount" style="width: 180px ;margin-right: 50px" 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+`" ></input>`;
} else {
var amountTmp = goodsList[0].price.toFixed(2);
HtmlAmount += `<input id="htmlAmount" class="form-control" name="htmlAmount" style="width: 180px;margin-right: 50px" type="number" readonly="readonly" value="`+amountTmp+`"></input>`
}
let htmlDel = "";
if (isView != "true") {
htmlDel += `<button type="button" class="search btn btn-primary" style="background-color: #d73925 ;" onclick="deleteSelect(event)">删除</button>`;
}
let html = `<li id="form-translate" class="list-group-item translate" style="display:flex ;">
${idHtml}
<select class="form-control select2 releas" name="releas" style="width: 180px;" onchange="getPrice(this)">
<select class="form-control select2 releas" name="releas" style="width: 180px;" #if($!{isView} == 'true') disabled="disabled" #end onchange="getPrice(this)">
${options}
</select>
${listHtml}
......@@ -393,7 +419,8 @@
${HtmlPrice}
${HtmlAmount}
<button type="button" class="search btn btn-primary" style="background-color: #d73925 ;" onclick="deleteSelect(event)">删除</button>
${htmlDel}
</li>`;
$("#group").append(html);
......@@ -474,7 +501,6 @@
var img = document.getElementById("prescription");
let imgH = img.naturalHeight;//图片高度
let imgW = img.naturalWidth;//图片宽度
//console.log(imgH + "-" + imgW);
let finalImgH = ($('.content-wrapper').height() * 0.8).toFixed(2);
let algorithm = (imgH / finalImgH).toFixed(2);
......
aidea-modules/consult-module-web/src/main/webapp/WEB-INF/views/consultSheet/consultSheetlist.html
View file @ 860d3141
......@@ -312,7 +312,7 @@
"mData": "orderCode",
"mRender": function (a, b, c, d) {
if (a) {
var html = `#if($shiro.hasPermission("qy:order:view"))<a href="#springUrl("/a/consultSheet/orderlist?orderCode=` + a + `")">` + a + `</a> #end`;
var html = `#if($shiro.hasPermission("qy:order:view"))<a href="#springUrl("/a/consultSheet/orderlist?orderCode=` + a + `")">` + a + `</a>#else` + a + `#end`;
return html;
} else {
return '';
......@@ -438,9 +438,9 @@
'</button>\n' +
'<ul class="dropdown-menu" role="menu" style="min-width: 100px;">\n';
if (c.status == '0') {
html += '<li>#if($shiro.hasPermission("qy:consultSheet:edit"))<a href="#springUrl("/a/consultSheet/form?id=' + a + '")" class="btn green">审核</a>#end</li>';
html += '<li>#if($shiro.hasPermission("qy:consultSheet:edit"))<a href="#springUrl("/a/consultSheet/form?pageType=Audit&id=' + a + '")" class="btn green">审核</a>#end</li>';
} else {
html += '<li>#if($shiro.hasPermission("qy:consultSheet:view"))<a href="#springUrl("/a/consultSheet/form?id=' + a + '")" class="btn green">查看</a> #end</li>';
html += '<li>#if($shiro.hasPermission("qy:consultSheet:view"))<a href="#springUrl("/a/consultSheet/form?pageType=View&id=' + a + '")" class="btn green">查看</a> #end</li>';
}
html += '</ul>';
return html;
......
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/dao/ConsultSheetMapper.xml
View file @ 860d3141
......@@ -159,7 +159,7 @@
#{prescription, jdbcType=VARCHAR},
#{doctorId, jdbcType=BIGINT},
#{serviceId, jdbcType=BIGINT},
#{illness, jdbcType=BIGINT},
#{illness, jdbcType=VARCHAR},
#{accountsId, jdbcType=BIGINT},
#{delFlag, jdbcType=TINYINT},
#{status, jdbcType=VARCHAR},
......@@ -182,7 +182,7 @@
<select id="fetchById" parameterType="java.lang.Long" resultType="com.cftech.consultsheet.model.ConsultSheet">
SELECT
<include refid="sqlColumns"/>, d.name pharmacist,e.org_name hospital
<include refid="sqlColumns"/>, d.name pharmacist, e.org_name hospital
FROM t_aidea_consult_sheet a
LEFT JOIN t_qyuser b ON b.id = a.doctor_id
LEFT JOIN t_qyuser c ON c.id = a.service_id
......@@ -201,9 +201,9 @@
<select id="fetchSearchByCount" parameterType="java.util.Map" resultType="java.lang.Integer">
SELECT COUNT(1) FROM t_aidea_consult_sheet a
LEFT JOIN t_order o ON a.order_id = o.id
LEFT JOIN t_qyuser b ON b.id = a.doctor_id
LEFT JOIN t_qyuser c ON c.id = a.service_id
LEFT JOIN `user` u ON u.userid = b.id
<include refid="sqlWhere"/>
<if test="id!=null">and (a.doctor_id = ${id} or a.service_id =${id} )</if>
</select>
......@@ -275,7 +275,7 @@
service_id = #{serviceId, jdbcType=BIGINT},
</if>
<if test="illness != null">
illness = #{illness, jdbcType=BIGINT},
illness = #{illness, jdbcType=VARCHAR},
</if>
<if test="accountsId != null">
accounts_id = #{accountsId, jdbcType=BIGINT},
......
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/service/impl/ConsultSheetServiceImpl.java
View file @ 860d3141
......@@ -24,6 +24,7 @@ import com.cftech.core.util.StringUtils;
import com.cftech.core.util.SystemConfig;
import com.cftech.member.model.Member;
import com.cftech.member.service.MemberService;
import com.cftech.order.model.Order;
import com.cftech.order.service.OrderService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
......@@ -89,9 +90,19 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
return consultSheetMapper.updateStatus(consultId, status, des);
}
@Override
public Integer fetchSearchByCount(Conds conds, Long id) {
Map<String, Object> params = new HashMap<>();
params.put("conds", conds);
if (id != null && id != 1) {
params.put("id", id);
}
return consultSheetMapper.fetchSearchByCount(params);
}
@Override
public List<ConsultSheet> fetchSearchBy(Conds conds, Sort sort, int page, int pageSize, Long id) {
Map<String, Object> params = new HashMap<String, Object>();
Map<String, Object> params = new HashMap<>();
params.put("conds", conds);
params.put("offset", page > 0 ? page : 0);
params.put("limit", pageSize > 0 ? pageSize : 0);
......@@ -171,22 +182,15 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
Conds conds = new Conds();
conds.equal("o.del_flag", Constants.DEL_FLAG_0);
conds.equal("o.openid", openid);
conds.in("o.status", new String[]{"5"});//2 待发货，3：待收货 4:待付款
int count = orderService.count(conds);
if (count > 0) { //复购
Conds memberConds = new Conds();
memberConds.equal("del_flag", Constants.DEL_FLAG_0);
memberConds.equal("open_id", openid);
Member member = memberService.fetchSearchByConds(memberConds);
if (member == null) {
firstCustomerProcess(consultSheet);
return true;
}
conds.in("o.status", new String[]{"4"});// 4:已成交
Sort sort = new Sort("o.create_time", OrderType.DESC);
List<Order> orders = orderService.fetchSearchBy(conds, sort, 0, 0, null);
if (orders != null && orders.size() > 0 && orders.get(0) != null) { //复购
Order order = orders.get(0);
String serviceId = member.getServiceId();
Conds userConds = new Conds();
userConds.equal("t.del_flag", Constants.DEL_FLAG_0);
userConds.equal("t.id", serviceId);
userConds.equal("t.id", order.getServiceId());
Qyuser user = qyuserService.fetchSearchByConds(userConds);
if (user.getPeakVal() > 0) {//客服峰值大于0
consultSheet.setServiceId(user.getId());
......@@ -196,8 +200,7 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
return true;
}
String doctorId = member.getDoctorId();
userConds.equal("t.id", doctorId);
userConds.equal("t.id", order.getDoctorId());
user = qyuserService.fetchSearchByConds(userConds);
if (user.getPeakVal() > 0) {//药师峰值大于0
consultSheet.setDoctorId(user.getId());
......@@ -286,11 +289,11 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
user.setUnAssigned(user.getAssigned() + 1);
qyuserService.updateAssigned(user);
} else {
consultSheet.setDescription(arr[i].equals("1") ? "客服" : "药师" + "未有对应的咨询单处理人员");
consultSheet.setIllness((arr[i].equals("1") ? "客服" : "药师") + "未有对应的咨询单处理人员");
}
}
} else {
consultSheet.setDescription(arr[i].equals("1") ? "客服" : "药师" + "未有对应的咨询单处理人员");
consultSheet.setIllness((arr[i].equals("1") ? "客服" : "药师") + "未有对应的咨询单处理人员");
}
}
if (consultSheetMapper.update(consultSheet) > 0) {
......@@ -326,14 +329,4 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
agenId, msg, false);
}
@Override
public Integer fetchSearchByCount(Conds conds, Long id) {
Map<String, Object> params = new HashMap<String, Object>();
params.put("conds", conds);
if (id != null && id != 1) {
params.put("id", id);
}
return consultSheetMapper.fetchSearchByCount(params);
}
}
\ No newline at end of file
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/web/ConsultSheetController.java
View file @ 860d3141
......@@ -102,12 +102,12 @@ public class ConsultSheetController {
//编辑页面（新增、修改）
@RequiresPermissions(value = CONSULTSHEET_VIEW)
@RequestMapping("/form")
public String form(HttpServletRequest request, String id, Model model) {
public String form(String pageType, String id, Model model) {
if (StringUtils.isNoneBlank(id)) {
ConsultSheet consultSheet = consultSheetService.fetchById(id);
if (StringUtils.isNoneBlank(consultSheet.getUserName()) && consultSheet.getUserName().length() >=2) {
StringBuilder str = new StringBuilder(consultSheet.getUserName());
str.replace(1, 1, "*");
str.replace(1, 2, "*");
consultSheet.setUserName(str.toString());
}
if (StringUtils.isNoneBlank(consultSheet.getPhone())) {
......@@ -117,6 +117,7 @@ public class ConsultSheetController {
}
JSONObject object = JSON.parseObject(JSON.toJSONString(consultSheet));
model.addAttribute("data", object);
model.addAttribute("isView", pageType.equals("View") ? true : false);//是否查看页面
}
return "consultSheet/consultSheetform";
}
......@@ -157,7 +158,8 @@ public class ConsultSheetController {
Long accountsId = UserUtils.getmpaccounts(request);
Conds conds = new Conds();
conds.equal("a.del_flag", Constants.DEL_FLAG_0);
conds.equal("a.accounts_id", accountsId);
if (StringUtils.isNoneBlank(consultSheet.getConsultId())) {
conds.like("a.consult_id", "%" + consultSheet.getConsultId() + "%");
}
......@@ -173,8 +175,7 @@ public class ConsultSheetController {
if (StringUtils.isNoneBlank(consultSheet.getEndAuditTime())) {
conds.lessEqual("DATE_FORMAT(a.audit_time, '%Y-%m-%d')", consultSheet.getEndAuditTime());
}
conds.equal("a.del_flag", Constants.DEL_FLAG_0);
conds.equal("a.accounts_id", accountsId);
Sort sort = new Sort("a.create_time", OrderType.DESC);
List<ConsultSheet> list = consultSheetService.fetchSearchBy(conds, sort, iDisplayStart, iDisplayLength, id);
......@@ -372,7 +373,7 @@ public class ConsultSheetController {
order.setDescription(goodsDes);
//获取默认地址
if (StringUtils.isEmpty(consultSheet.getAddressId())) {
if (StringUtils.isNoneBlank(consultSheet.getAddressId())) {
Conds adsConds = new Conds();
adsConds.equal("t.del_flag", Constants.DEL_FLAG_0);
adsConds.equal("t.open_id", consultSheet.getOpenId());
......@@ -403,7 +404,6 @@ public class ConsultSheetController {
consultSheet.setOrderId(order.getId());
consultSheetService.update(consultSheet);
//发送审核通过模板消息
String appid = SystemConfig.p.getProperty("WX_MP_SERVER_APPID");
String refuseTmpId = SystemConfig.p.getProperty("CONSULT_SHEET_AUDIT_SUCCESS_TEMPLATE_MSG");
......
aidea-modules/consult-module/target/classes/com/cftech/consultsheet/dao/ConsultSheetMapper.xml
View file @ 860d3141
......@@ -159,7 +159,7 @@
#{prescription, jdbcType=VARCHAR},
#{doctorId, jdbcType=BIGINT},
#{serviceId, jdbcType=BIGINT},
#{illness, jdbcType=BIGINT},
#{illness, jdbcType=VARCHAR},
#{accountsId, jdbcType=BIGINT},
#{delFlag, jdbcType=TINYINT},
#{status, jdbcType=VARCHAR},
......@@ -182,7 +182,7 @@
<select id="fetchById" parameterType="java.lang.Long" resultType="com.cftech.consultsheet.model.ConsultSheet">
SELECT
<include refid="sqlColumns"/>, d.name pharmacist,e.org_name hospital
<include refid="sqlColumns"/>, d.name pharmacist, e.org_name hospital
FROM t_aidea_consult_sheet a
LEFT JOIN t_qyuser b ON b.id = a.doctor_id
LEFT JOIN t_qyuser c ON c.id = a.service_id
......@@ -201,9 +201,9 @@
<select id="fetchSearchByCount" parameterType="java.util.Map" resultType="java.lang.Integer">
SELECT COUNT(1) FROM t_aidea_consult_sheet a
LEFT JOIN t_order o ON a.order_id = o.id
LEFT JOIN t_qyuser b ON b.id = a.doctor_id
LEFT JOIN t_qyuser c ON c.id = a.service_id
LEFT JOIN `user` u ON u.userid = b.id
<include refid="sqlWhere"/>
<if test="id!=null">and (a.doctor_id = ${id} or a.service_id =${id} )</if>
</select>
......@@ -275,7 +275,7 @@
service_id = #{serviceId, jdbcType=BIGINT},
</if>
<if test="illness != null">
illness = #{illness, jdbcType=BIGINT},
illness = #{illness, jdbcType=VARCHAR},
</if>
<if test="accountsId != null">
accounts_id = #{accountsId, jdbcType=BIGINT},
......
aidea-modules/order-detail-module-web/src/main/webapp/WEB-INF/views/orderDetails/orderDetailslist.html
View file @ 860d3141
......@@ -112,7 +112,7 @@
<th>商品总价</th>
<th>商品规格</th>
<th>创建时间</th>
<th>erp物料号</th>
<!--<th>erp物料号</th>-->
<th>操作</th>
</tr>
</thead>
......@@ -242,9 +242,9 @@
{
"mData": "createTime"
},
{
"mData": "drugsMateriel"
},
// {
// "mData": "drugsMateriel"
// },
{
"mData": "id"
}],
......@@ -315,14 +315,6 @@
},
{
"aTargets": [9],
"mData": "drugsMateriel",
"mRender": function (a, b, c, d) {
return a;
}
},
{
"aTargets": [10],
"mData": "id",
"mRender": function (a, b, c, d) {
var html = '#if($shiro.hasPermission("qy:orderDetails:edit"))';
......
aidea-modules/order-module-web/src/main/webapp/WEB-INF/views/order/orderform.html
View file @ 860d3141
......@@ -179,15 +179,19 @@
<th style=""><label style="width: 180px;margin-right: 50px;text-align: center">商品总价</label></th>
</li>
</div>
#if ($!{isView} != 'true')
<button type="button" class="search btn btn-primary" onclick="clickAdd()">添加商品</button>
#end
</div>
</div>
</div>
<div class="box-footer">
#if ($!{isView} != 'true')
#if($shiro.hasPermission("qy:order:edit"))
<button class="btn btn-primary" onclick="save()">保存</button>
#end
#end
<a href="#springUrl('/a/order/list')" class="btn btn-default">取消</a>
</div>
<!--</form>-->
......@@ -235,6 +239,7 @@
var csrf='${_csrf.token}';
var csrf_header='${_csrf.headerName}';
var goodsList = [];
var isView = `$!{isView}`;
let status = `$!{data.status}`;
console.log(status);
......@@ -248,7 +253,7 @@
str = "待付款";
break;
case '2':
str = "代发货";
str = "待发货";
break;
case '3':
str = "待收货";
......@@ -256,7 +261,7 @@
case '4':
str = "已完成";
break;
case '4':
case '5':
str = "已取消";
break;
}
......@@ -271,26 +276,25 @@
type: "GET",
success: function (res) {
goodsList = JSON.parse(res.data);
//订单产品
let detailList = `$!{list}`;
if (detailList != null && detailList != '' && detailList != '[]') {
let arr = JSON.parse(detailList);
for (let i = 0; i < arr.length; i ++) {
let obj = arr[i];
clickAdd(obj.id, obj.productId, obj.count, obj.price, obj.amount);
if (isView == "true") {//查看
let details = `$!{list}`;
if (details != null && details != '' && details != '[]') {
let arr = JSON.parse(details);
for (let i = 0; i < arr.length; i ++) {
let obj = arr[i];
clickAdd(obj.id, obj.productId, obj.drugsNum, obj.price, obj.amount);
}
}
} else {
} else {//编辑
let datas = `$!{data.description}`;
if (datas != null && datas != "") {
let arr = JSON.parse(datas);
for (let i = 0; i < arr.length; i ++) {
let obj = arr[i];
clickAdd(null, obj.productId, obj.count, obj.price, obj.amount);
clickAdd(null, obj.productId, obj.drugsNum, obj.price, obj.amount);
}
}
}
}
});
}
......@@ -313,7 +317,7 @@
var listHtml = "";
if (count && count != null) {
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>`;
listHtml += `<input name="listHtml" class="form-control" type='number' style="width: 180px;margin-right: 50px; margin-left: 50px;" #if($!{isView} == 'true') readonly="readonly" #end 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 {
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>`;
}
......@@ -322,14 +326,13 @@
var HtmlPrice = "";
if (price != null && price != '') {
HtmlPrice += `<input name="htmlPrice" class="form-control" data-price="`+price+`" style="width: 180px ;margin-right: 50px" type='text' `;
if (bool == "1") { HtmlPrice += `readonly="readonly"`; }
if (bool == "1" || isView == "true") { HtmlPrice += `readonly="readonly"`; }
let priceTmp = parseInt(price).toFixed(2);
HtmlPrice +=` onchange="updatePrice(this)" value="`+priceTmp+`"></input>`;
} else {
let priceTmp = parseInt(goodsList[0].price).toFixed(2);
HtmlPrice += `<input name="htmlPrice" class="form-control" data-price="`+priceTmp+`" style="width: 180px ;margin-right: 50px" type="text" `;
//console.log(bool);
if (bool == "1") { HtmlPrice += `readonly="readonly"`; }
if (bool == "1" || isView == "true") { HtmlPrice += `readonly="readonly"`; }
HtmlPrice += ` onchange="updatePrice(this)" value="`+priceTmp+`"></input>`;
}
......@@ -341,10 +344,13 @@
HtmlAmount += `<input id="htmlAmount" class="form-control" name="htmlAmount" style="width: 180px;margin-right: 50px" type="number" readonly="readonly" value="`+amountTmp+`"></input>`
}
let htmlDel = "";
if (isView != 'true') {
htmlDel += `<button type="button" class="search btn btn-primary" style="background-color: #d73925 ;" onclick="deleteSelect(event)">删除</button>`;
}
let html = `<li id="form-translate" class="list-group-item translate" style="display:flex ;">
${idHtml}
<select class="form-control select2 releas" name="releas" style="width: 180px;" onchange="getPrice(this)">
<select class="form-control select2 releas" name="releas" style="width: 180px;" #if($!{isView} == 'true') disabled="disabled" #end onchange="getPrice(this)">
${options}
</select>
${listHtml}
......@@ -352,7 +358,8 @@
${HtmlPrice}
${HtmlAmount}
<button type="button" class="search btn btn-primary" style="background-color: #d73925 ;" onclick="deleteSelect(event)">删除</button>
${htmlDel}
</li>`;
$("#group").append(html);
......
aidea-modules/order-module-web/src/main/webapp/WEB-INF/views/order/orderlist.html
View file @ 860d3141
......@@ -491,8 +491,11 @@
'</button>\n' +
'<ul class="dropdown-menu" role="menu" style="min-width: 100px;">\n';
html += '<li><a href="#springUrl("/a/order/findorderDetail?id=' + a + '&isDetail=y")">查看清单明细</a></li>';
if (c.status != '3' && c.status != '4' && c.status != '5') {
html += '<li><a href="#springUrl("/a/order/form?id=' + a + '")">添加商品</a></li>';
if (c.status == '0') {
html += '<li><a href="#springUrl("/a/order/form?pageType=Edit&id=' + a + '")">添加商品</a></li>';
}
if (c.status != '0') {
html += '<li><a href="#springUrl("/a/order/form?pageType=View&id=' + a + '")">查看详情</a></li>';
}
if (c.status == '1') {
html += '<li><a onclick="updateStatusSuccess(' + a + ')">订单付款</a></li>';
......@@ -500,9 +503,9 @@
if (c.status != '4' && c.status != '5') {
html += '<li><a onclick="showModal(' + a + ')">订单关闭</a></li>';
}
if (c.status == '2') {//待发货才可以出库操作
html += '<li><a href="#springUrl("/a/order/sendOut?id=' + a + '")">订单出库</a></li>';
}
// if (c.status == '2') {//待发货才可以出库操作
// html += '<li><a href="#springUrl("/a/order/sendOut?id=' + a + '")">订单出库</a></li>';
// }
html += '</ul>';
html += '#end';
return html;
......@@ -542,7 +545,7 @@
btntext: "确定",
btncanceltext: "取消",
success: function () {
updateStatu(id, 3, null);//付款待发货
updateStatu(id, 2, null);//付款待发货
},
cancel: function () {
location.href = "#springUrl('/a/order/list')";
......
aidea-modules/order-module/src/main/java/com/cftech/order/dao/OrderMapper.xml
View file @ 860d3141
......@@ -34,6 +34,7 @@
<result column="address_id" property="addressId"/>
<result column="clerk_id" property="clerkId"/>
<result column="address_des" property="addressDes"/>
<result column="order_time" property="orderTime"/>
</resultMap>
<resultMap id="resultMapList" type="com.cftech.order.model.Order">
......@@ -202,7 +203,8 @@
`service_id`,
`doctor_id`,
`clerk_id`,
address_des
address_des,
order_time
)
values
(
......@@ -233,7 +235,8 @@
#{serviceId, jdbcType=BIGINT},
#{doctorId, jdbcType=BIGINT},
#{clerkId, jdbcType=BIGINT},
#{addressDes, jdbcType=VARCHAR}
#{addressDes, jdbcType=VARCHAR},
#{orderTime, jdbcType=TIMESTAMP}
)
</insert>
<update id="deleteAll" >
......@@ -392,7 +395,10 @@
clerk_id = #{clerkId, jdbcType=BIGINT},
</if>
<if test="addressDes != null">
address_des = #{addressDes, jdbcType=VARCHAR}
address_des = #{addressDes, jdbcType=VARCHAR},
</if>
<if test="orderTime != null">
order_time = #{orderTime, jdbcType=VARCHAR}
</if>
</set>
where id=#{id,jdbcType=BIGINT}
......@@ -421,7 +427,6 @@
<if test="amount != null">
amount = #{amount}
</if>
</set>
where order_id =#{id} and id = #{idDetail}
</update>
......@@ -471,7 +476,7 @@
status = #{status},
</if>
<if test="orderCancel!=null and orderCancel != ''">
order_cancel = #{status}
order_cancel = #{orderCancel}
</if>
</set>
where id= #{id}
......
aidea-modules/order-module/src/main/java/com/cftech/order/model/Order.java
View file @ 860d3141
......@@ -84,6 +84,8 @@ public class Order extends OrderDetail implements Serializable {
private Date createTime;
/* 更新时间 */
private Date updateTime;
private Date orderTime;
/* 备注 */
private String description;
/* 创建人 */
......@@ -488,4 +490,12 @@ public class Order extends OrderDetail implements Serializable {
public void setNickName(String nickName) {
this.nickName = nickName;
}
public Date getOrderTime() {
return orderTime;
}
public void setOrderTime(Date orderTime) {
this.orderTime = orderTime;
}
}
\ No newline at end of file
aidea-modules/order-module/src/main/java/com/cftech/order/service/impl/OrderServiceImpl.java
View file @ 860d3141
......@@ -19,6 +19,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.io.Serializable;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -120,11 +121,13 @@ public class OrderServiceImpl extends GenericServiceImpl<Order> implements Order
params.put("amount", amount);
params.put("orderAmount", orderAmount);
params.put("idDetail", idDetail);
if (!"".equals(idDetail)) {
if (StringUtils.isNotBlank(idDetail)) {
orderMapper.updateDetill(params);
//更新订单
Order newOrder = orderMapper.fetchOrder(id);
newOrder.setStatus("1");
newOrder.setOrderAmount(orderAmount);
newOrder.setOrderTime(new Date());
orderMapper.update(newOrder);
rtnJson.put("errorNo", "0");
return rtnJson;
......@@ -134,19 +137,21 @@ public class OrderServiceImpl extends GenericServiceImpl<Order> implements Order
orderDetailDto = new OrderDetailDto();
orderDetailDto.setOrderCode(orders.getNumber());
orderDetailDto.setOrderId(id);
orderDetailDto.setDrugsId(productDtos.getId());
orderDetailDto.setOpenid(orders.getOpenid());
orderDetailDto.setPrice(productDtos.getPrice());
orderDetailDto.setPrice(price);
orderDetailDto.setAmount(amount);
orderDetailDto.setDrugsNum(drugsNum);
orderDetailDto.setDrugsId(productDtos.getId());
orderDetailDto.setDrugsCode(productDtos.getProductNumber());
orderDetailDto.setDrugsSku(productDtos.getFormat());
orderDetailDto.setAccountsId(accountsId);
Integer detill = orderMapper.saveDetill(orderDetailDto);
if (detill > 0) {
Order newOrder = orderMapper.fetchOrder(id);
//更新订单
newOrder.setStatus("1");
newOrder.setOrderAmount(orderAmount);
newOrder.setOrderTime(new Date());
orderMapper.update(newOrder);
rtnJson.put("errorNo", "0");
rtnJson.put("errorMsg", "修改成功");
......
aidea-modules/order-module/src/main/java/com/cftech/order/web/OrderController.java
View file @ 860d3141
......@@ -70,10 +70,19 @@ public class OrderController {
return "order/orderlist";
}
//列表页面
@RequiresPermissions(value = ORDER_VIEW)
@RequestMapping("/listout")
public String listout(HttpServletRequest request, Model model) {
Long accountId = UserUtils.getmpaccounts(request);
model.addAttribute("accountId", accountId);
return "order/orderlistout";
}
//编辑页面（新增、修改）
@RequiresPermissions(value = ORDER_VIEW)
@RequestMapping("/form")
public String form(HttpServletRequest request, String id, Model model) {
public String form(HttpServletRequest request, String id, String pageType, Model model) {
if (!StringUtils.isEmpty(id)) {
OrderFromVO orderFromVO = orderService.fetchId(id);//订单信息
JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(orderFromVO));
......@@ -85,11 +94,12 @@ public class OrderController {
Integer i = orderService.isThreeUsers(orderFromVO.getOpenid());
if (i > 0) {
model.addAttribute("isThree", "0");
model.addAttribute("isThree", "0");//是
} else {
model.addAttribute("isThree", "1");
model.addAttribute("isThree", "1");//否
}
model.addAttribute("isView", pageType.equals("View") ? true : false);
}
return "order/orderform";
}
......
qy-modules/qy-orgunit-module-web/src/main/webapp/WEB-INF/views/managerqyuser/qyuseradd.html
View file @ 860d3141
......@@ -299,7 +299,7 @@
var smallimg = "$!{data.img}";
coverPP = new uePicPicker({
tarId: 'img',
title: '栏目小图',
title: '客服名片',
sizeDes: '205*202',
max: 1,
datas: smallimg=='' ? null : smallimg.split(","),
......@@ -327,7 +327,7 @@
$("#ImgSelect").click(function () {
obj = $(this);
Cfapp.sm({
title: "栏目图选择",
title: "名片图选择",
success: function (data) {
obj.find("i").remove();
$("#img").val(data[0]);
......
qy-modules/qy-orgunit-module/src/main/java/com/cftech/base/org/api/QyUserUtil.java
View file @ 860d3141
......@@ -104,10 +104,10 @@ public class QyUserUtil {
departments.add(orgUnit.getWxorgId());
postObj.put("department", departments);
}
if (!StringUtils.isEmpty(qyuser.getPositionId())) {
Position position = positionService.fetchById(qyuser.getPositionId());
postObj.put("position", position.getName());
}
// if (!StringUtils.isEmpty(qyuser.getPositionId())) {
// Position position = positionService.fetchById(qyuser.getPositionId());
// postObj.put("position", position.getName());
// }
if (!StringUtils.isEmpty(qyuser.getGender())) {
postObj.put("gender", qyuser.getGender().equals("男") ? "1" : "2");
}
......@@ -120,19 +120,19 @@ public class QyUserUtil {
if (!StringUtils.isEmpty(qyuser.getUserType())) {
switch (qyuser.getUserType()) {
case "0":
postObj.put("position", "客服");
postObj.put("position", "其他");
break;
case "1":
postObj.put("position", "药师");
break;
case "2":
postObj.put("position", "医生");
postObj.put("position", "客服");
break;
case "3":
postObj.put("position", "订单员");
postObj.put("position", "医生");
break;
case "4":
postObj.put("position", "其他");
postObj.put("position", "订单员");
break;
}
}
......@@ -144,7 +144,6 @@ public class QyUserUtil {
}
public boolean update(Qyuser qyuser) {
JSONObject postObj = new JSONObject();
postObj.put("userid", qyuser.getWxuserId());
postObj.put("name", qyuser.getName());
......@@ -155,10 +154,10 @@ public class QyUserUtil {
departments.add(orgUnit.getWxorgId());
postObj.put("department", departments);
}
if (!StringUtils.isEmpty(qyuser.getPositionId())) {
Position position = positionService.fetchById(qyuser.getPositionId());
postObj.put("position", position.getName());
}
// if (!StringUtils.isEmpty(qyuser.getPositionId())) {
// Position position = positionService.fetchById(qyuser.getPositionId());
// postObj.put("position", position.getName());
// }
if (!StringUtils.isEmpty(qyuser.getGender())) {
postObj.put("gender", qyuser.getGender().equals("男") ? "1" : "2");
}
......@@ -171,19 +170,19 @@ public class QyUserUtil {
if (!StringUtils.isEmpty(qyuser.getUserType())) {
switch (qyuser.getUserType()) {
case "0":
postObj.put("position", "客服");
postObj.put("position", "其他");
break;
case "1":
postObj.put("position", "药师");
break;
case "2":
postObj.put("position", "医生");
postObj.put("position", "客服");
break;
case "3":
postObj.put("position", "订单员");
postObj.put("position", "医生");
break;
case "4":
postObj.put("position", "其他");
postObj.put("position", "订单员");
break;
}
}
......
qy-modules/qy-orgunit-module/src/main/java/com/cftech/base/org/model/Qyuser.java
View file @ 860d3141
......@@ -156,8 +156,8 @@ public class Qyuser implements Serializable {
public Qyuser() {
this.delFlag = false;
this.peakVal = 0L;
this.assigned = 0L;
this.unAssigned = 0L;
// this.peakVal = 0L;
// this.assigned = 0L;
// this.unAssigned = 0L;
}
}
\ No newline at end of file
qy-modules/qy-orgunit-module/src/main/java/com/cftech/base/org/web/QyuserController.java
View file @ 860d3141
......@@ -113,7 +113,7 @@ public class QyuserController {
@RequiresPermissions(value = PermissionSign.QYUSER_EDIT)
@RequestMapping(value = "/formData", method = {RequestMethod.POST})
@ResponseBody
public JSONObject qyuserListformData(Qyuser qyuser, Model model, HttpServletRequest request, String terminalIds, String passwordQyUser, String loginNameQyUser) {
public JSONObject qyuserListformData(Qyuser qyuser, Model model, HttpServletRequest request, String passwordQyUser, String loginNameQyUser) {
Long accountId = Long.parseLong(qyAccounts);
JSONObject rtnJson = new JSONObject();
Long userId = UserUtils.getUser().getId();
......@@ -164,6 +164,9 @@ public class QyuserController {
user = new User();
//新增
qyuser.setPeakVal(0L);
qyuser.setAssigned(0L);
qyuser.setUnAssigned(0L);
qyuser.setDelFlag(false);
qyuser.setAccountsId(accountId);
qyuser.setCreateBy(UserUtils.getUser().getId());
......
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