Skip to content

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

Aidea product update by Strive Date 2020-11-23

parent 62f375f0
Expand all Show whitespace changes
Inline Side-by-side
Showing with 573 additions and 345 deletions
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/dao/ConsultSheetMapper.java
View file @ 2b2a6143
......@@ -10,6 +10,7 @@ import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
import java.util.List;
import java.util.Map;
/**
* 咨询单Mapper
......@@ -19,11 +20,13 @@ import java.util.List;
*/
public interface ConsultSheetMapper extends GenericDao<ConsultSheet> {
Integer updateDate(@Param("id") Long id, @Param("status") String status, @Param("description") String description);
Integer updateDate(@Param("consultId") Long consultId, @Param("status") String status, @Param("description") String description);
Integer updateStatus(@Param("id") Long id,@Param("status") String status);
Integer updateStatus(@Param("consultId") Long id, @Param("status") String status, @Param("des") String des);
List<ConsultSheet> fetchSearchByPage(Conds conds, Sort sort, int page, int pageSize, Long id);
List<ConsultSheet> consultSheetList(ConsultSheetDto consultSheetDto);
Integer fetchSearchByCount(Map<String, Object> params);
}
\ No newline at end of file
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/dao/ConsultSheetMapper.xml
View file @ 2b2a6143
......@@ -176,7 +176,7 @@
#{memberId, jdbcType=BIGINT},
#{orderId, jdbcType=BIGINT},
#{addressId, jdbcType=VARCHAR},
#{auditTime, jdbcType=TIMESTAMP},
#{auditTime, jdbcType=TIMESTAMP}
)
</insert>
......@@ -197,7 +197,15 @@
LEFT JOIN t_qyuser c ON c.id = a.service_id
LEFT JOIN `user` u ON u.userid = b.id
<include refid="sqlWhere"/>
</select>
<select id="fetchSearchByCount" parameterType="java.util.Map" resultType="java.lang.Integer">
SELECT COUNT(1) 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
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>
<select id="fetchSearchByPage" parameterType="java.util.Map" resultType="com.cftech.consultsheet.model.ConsultSheet">
......@@ -332,8 +340,9 @@
status = #{status},
</if>
<if test="description !=null">
description = #{description}
description = #{description},
</if>
audit_time = now()
</set>
where id = #{consultId}
</update>
......@@ -342,9 +351,12 @@
update t_aidea_consult_sheet
<set>
<if test="status !=null">
status = #{status}
status = #{status},
</if>
<if test="des !=null and des != ''">
symptom = #{des},
</if>
audit_time = now()
</set>
where id = #{consultId}
</update>
......
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/service/ConsultSheetService.java
View file @ 2b2a6143
......@@ -20,16 +20,24 @@ public interface ConsultSheetService extends GenericService<ConsultSheet> {
Integer updateDate(Long id, String status, String description);
Integer updateStatus(Long id, String status);
/**
* 咨询单审核
* @param id
* @param status
* @param des
* @return
*/
Integer updateStatus(Long id, String status, String des);
List<ConsultSheet> fetchSearchBy(Conds conds, Sort sort, int page, int pageSize ,String id);
List<ConsultSheet> fetchSearchBy(Conds conds, Sort sort, int page, int pageSize ,Long id);
/**
* 提交咨询单且轮询对应客服、医生进行处理
* @param consultSheet
*/
JSONObject pollingConsultSheet(ConsultSheet consultSheet);
/**
/**
* @Author Licc
* @Description 咨询单列表
* @Date 13:04 2020/11/1
......@@ -39,4 +47,6 @@ public interface ConsultSheetService extends GenericService<ConsultSheet> {
JSONObject consultSheetList(ConsultSheetDto consultSheetDto);
void sendQyWechatMassage(ConsultSheet consultSheet);
Integer fetchSearchByCount(Conds conds, Long id);
}
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/service/impl/ConsultSheetServiceImpl.java
View file @ 2b2a6143
......@@ -71,7 +71,7 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
@Autowired
private QyMsgUtil qyMsgUtil;
static final String[] arr = new String[]{"0", "1"};
static final String[] arr = new String[]{"1", "2"};
@Override
public GenericDao<ConsultSheet> getGenericMapper() {
......@@ -80,26 +80,23 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
@Override
public Integer updateDate(Long id, String status, String description) {
return consultSheetMapper.updateDate(id, status, description);
public Integer updateDate(Long consultId, String status, String description) {
return consultSheetMapper.updateDate(consultId, status, description);
}
@Override
public Integer updateStatus(Long id, String status) {
return consultSheetMapper.updateStatus(id,status);
public Integer updateStatus(Long consultId, String status, String des) {
return consultSheetMapper.updateStatus(consultId, status, des);
}
@Override
public List<ConsultSheet> fetchSearchBy(Conds conds, Sort sort, int page, int pageSize, String id) {
public List<ConsultSheet> fetchSearchBy(Conds conds, Sort sort, int page, int pageSize, Long id) {
Map<String, Object> params = new HashMap<String, Object>();
params.put("conds", conds);
params.put("offset", page > 0 ? page : 0);
params.put("limit", pageSize > 0 ? pageSize : 0);
params.put("sort", sort);
if (!StringUtils.equals(id, "1")) {
if (id != null && id != 1) {
params.put("id", id);
}
return consultSheetMapper.fetchSearchByPage(params);
......@@ -174,7 +171,7 @@ 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[]{"2", "3", "4"});//2 待发货，3：待收货 4:待付款
conds.in("o.status", new String[]{"5"});//2 待发货，3：待收货 4:待付款
int count = orderService.count(conds);
if (count > 0) { //复购
Conds memberConds = new Conds();
......@@ -183,6 +180,7 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
Member member = memberService.fetchSearchByConds(memberConds);
if (member == null) {
firstCustomerProcess(consultSheet);
return true;
}
String serviceId = member.getServiceId();
......@@ -195,6 +193,7 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
//推送消息
} else {//普通轮询
firstCustomerProcess(consultSheet);
return true;
}
String doctorId = member.getDoctorId();
......@@ -204,9 +203,11 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
consultSheet.setDoctorId(user.getId());
} else {//普通轮询
firstCustomerProcess(consultSheet);
return true;
}
} else {//首次购买
firstCustomerProcess(consultSheet);
return true;
}
if (consultSheetMapper.update(consultSheet) > 0) {
......@@ -228,12 +229,12 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
Conds conds = new Conds();
conds.equal("t.del_flag", Constants.DEL_FLAG_0);
conds.equal("t.user_type", arr[i]);//0:客服; 1:药师
conds.equal("t.user_type", arr[i]);//1:药师; 2:客服
conds.greatThan("t.peak_val", 0);
Sort sort = new Sort("t.assigned", OrderType.ASC);//峰值未满
List<Qyuser> users = qyuserService.fetchSearchByPage(conds, sort, 0, 0);
if (users.size() == 1) {
if (arr[i].equals("0")) {
if (arr[i].equals("2")) {
consultSheet.setServiceId(users.get(0).getId());
} else {
consultSheet.setDoctorId(users.get(0).getId());
......@@ -252,7 +253,7 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
for (Qyuser user : users) {
if (user.getPeakVal() > user.getAssigned()) {//峰值未满
if (arr[i].equals("0")) {
if (arr[i].equals("2")) {
consultSheet.setServiceId(user.getId());
} else {
consultSheet.setDoctorId(user.getId());
......@@ -275,7 +276,7 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
if (users.size() > 0) {
Qyuser user = users.get(0);
if (arr[i].equals("0")) {
if (arr[i].equals("2")) {
consultSheet.setServiceId(user.getId());
} else {
consultSheet.setDoctorId(user.getId());
......@@ -285,13 +286,18 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
user.setUnAssigned(user.getAssigned() + 1);
qyuserService.updateAssigned(user);
} else {
consultSheet.setDescription(arr[i].equals("0") ? "客服" : "药师" + "未有对应的咨询单处理人员");
consultSheet.setDescription(arr[i].equals("1") ? "客服" : "药师" + "未有对应的咨询单处理人员");
}
}
} else {
consultSheet.setDescription(arr[i].equals("0") ? "客服" : "药师" + "未有对应的咨询单处理人员");
consultSheet.setDescription(arr[i].equals("1") ? "客服" : "药师" + "未有对应的咨询单处理人员");
}
}
if (consultSheetMapper.update(consultSheet) > 0) {
//推送客服,药师
sendQyWechatMassage(consultSheet);
return true;
}
return true;
}
......@@ -320,4 +326,14 @@ 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 @ 2b2a6143
......@@ -26,6 +26,7 @@ import org.mp.api.wxsendmsg.JwTemplateMessageAPI;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.owasp.esapi.ESAPI;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
......@@ -33,6 +34,7 @@ import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.util.HtmlUtils;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
......@@ -151,7 +153,7 @@ public class ConsultSheetController {
@RequestMapping(value = "/listData")
@ResponseBody
public JSONObject listData(int iDisplayStart, int iDisplayLength, ConsultSheet consultSheet, HttpServletRequest request) {
String id = String.valueOf(UserUtils.getUser().getId());
Long id = UserUtils.getUser().getUserid();
Long accountsId = UserUtils.getmpaccounts(request);
Conds conds = new Conds();
......@@ -176,7 +178,7 @@ public class ConsultSheetController {
Sort sort = new Sort("a.create_time", OrderType.DESC);
List<ConsultSheet> list = consultSheetService.fetchSearchBy(conds, sort, iDisplayStart, iDisplayLength, id);
Integer counts = consultSheetService.count(conds);
Integer counts = consultSheetService.fetchSearchByCount(conds, id);
JSONObject rtnJson = new JSONObject();
rtnJson.put("iTotalRecords", counts);
rtnJson.put("iTotalDisplayRecords", counts);
......@@ -327,15 +329,16 @@ public class ConsultSheetController {
@RequiresPermissions(value = CONSULTSHEET_EDIT)
@RequestMapping("/updateStatus")
@ResponseBody
public JSONObject updateStatus(Long consultId, String status, Long pastRecords, Long allergy, HttpServletRequest request) {
public JSONObject updateStatus(Long consultId, String status, Long pastRecords, Long allergy, String goodsDes, HttpServletRequest request) {
Long accountId = UserUtils.getmpaccounts(request);
JSONObject rtnJson = new JSONObject();
ConsultSheet consultSheet = consultSheetService.fetchById(consultId);
try {
if (consultId != null && StringUtils.isNoneBlank(status)) {
Integer integer = consultSheetService.updateStatus(consultId, status);
String contents = ESAPI.encoder().decodeForHTML(goodsDes);
goodsDes = HtmlUtils.htmlUnescape(contents);
Integer integer = consultSheetService.updateStatus(consultId, status, goodsDes);
if (integer > 0){
//生成空订单
Order order = new Order();
order.setNumber(codingruleUtils.getNumber(consultSheet.getAccountsId(), Order.class.getName()));
......@@ -345,6 +348,7 @@ public class ConsultSheetController {
order.setDoctorId(consultSheet.getDoctorId());
order.setAccountsId(accountId);
order.setStatus("0");//添加订单待确认
order.setDescription(goodsDes);
//获取默认地址
if (StringUtils.isEmpty(consultSheet.getAddressId())) {
......@@ -364,6 +368,7 @@ public class ConsultSheetController {
order.setAddressId(Long.parseLong(consultSheet.getAddressId()));
order.setAddressDes(address.getProvinceName()+address.getCityName()+address.getCountyName()+address.getAddressName());
}
orderService.save(order);
//反写咨询单
......
aidea-modules/consult-module/target/classes/com/cftech/consultsheet/dao/ConsultSheetMapper.xml
View file @ 2b2a6143
......@@ -176,7 +176,7 @@
#{memberId, jdbcType=BIGINT},
#{orderId, jdbcType=BIGINT},
#{addressId, jdbcType=VARCHAR},
#{auditTime, jdbcType=TIMESTAMP},
#{auditTime, jdbcType=TIMESTAMP}
)
</insert>
......@@ -197,7 +197,15 @@
LEFT JOIN t_qyuser c ON c.id = a.service_id
LEFT JOIN `user` u ON u.userid = b.id
<include refid="sqlWhere"/>
</select>
<select id="fetchSearchByCount" parameterType="java.util.Map" resultType="java.lang.Integer">
SELECT COUNT(1) 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
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>
<select id="fetchSearchByPage" parameterType="java.util.Map" resultType="com.cftech.consultsheet.model.ConsultSheet">
......@@ -332,8 +340,9 @@
status = #{status},
</if>
<if test="description !=null">
description = #{description}
description = #{description},
</if>
audit_time = now()
</set>
where id = #{consultId}
</update>
......@@ -342,9 +351,12 @@
update t_aidea_consult_sheet
<set>
<if test="status !=null">
status = #{status}
status = #{status},
</if>
<if test="des !=null and des != ''">
symptom = #{des},
</if>
audit_time = now()
</set>
where id = #{consultId}
</update>
......
aidea-modules/order-detail-module-web/src/main/webapp/WEB-INF/views/orderDetails/orderDetailslist.html
View file @ 2b2a6143
......@@ -165,8 +165,8 @@
var hour = now.getHours();
var minute = now.getMinutes();
var second = now.getSeconds();
return year + "-" + month + "-" + date + " " + hour + ":"
+ minute + ":" + second;
return year + "-" + (month <= 9 ? "0" + month : month) + "-" + (date <= 9 ? "0" + date : date) + " " + (hour <= 9 ? "0" + hour : hour) + ":"
+ (minute <= 9 ? "0" + minute : minute) + ":" + (second <= 9 ? "0" + second : second);
}
function seachTable() {
......@@ -309,7 +309,7 @@
"aTargets": [8],
"mData": "createTime",
"mRender": function (a, b, c, d) {
return a;
return formatDates(a);
}
},
......
aidea-modules/order-module-web/src/main/webapp/WEB-INF/views/order/orderlist.html
View file @ 2b2a6143
......@@ -56,6 +56,33 @@
<div class="wrapper">
<div class="content-wrapper" style="margin-left:0;">
<div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title" id="exampleModalLabel" style="font-weight: 700;">订单关闭原由</h4>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<form>
<div class="form-group">
<label for="message-text" class="col-form-label">请输入关闭原由:</label>
<textarea class="form-control" rows="3" id="js-textarea"></textarea>
<input type="hidden" id="orderId">
</div>
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
<button type="button" class="btn btn-primary" onclick="review()">提交</button>
</div>
</div>
</div>
</div>
<div id="importExcelDiv"></div>
<section class="content-header">
......@@ -178,7 +205,6 @@
<th>顺丰运单号</th>
<th>订单状态</th>
<th>支付交易号</th>
<th>支付备注</th>
<th>是否开票</th>
<th>创建时间</th>
<th>操作</th>
......@@ -242,8 +268,8 @@
var hour = now.getHours();
var minute = now.getMinutes();
var second = now.getSeconds();
return year + "-" + month + "-" + date + " " + hour + ":"
+ minute + ":" + second;
return year + "-" + (month <= 9 ? "0" + month : month) + "-" + (date <= 9 ? "0" + date : date) + " " + (hour <= 9 ? "0" + hour : hour) + ":"
+ (minute <= 9 ? "0" + minute : minute) + ":" + (second <= 9 ? "0" + second : second);
}
function seachTable() {
......@@ -322,10 +348,7 @@
{
"mData": "tradeNo"
}
,
{
"mData": "description"
}
,
{
"mData": "confirm"
......@@ -441,14 +464,6 @@
,
{
"aTargets": [11],
"mData": "description",
"mRender": function (a, b, c, d) {
return a;
}
}
,
{
"aTargets": [12],
"mData": "confirm",
"mRender": function (a, b, c, d) {
return a == null ? '否':'是';
......@@ -456,7 +471,7 @@
}
,
{
"aTargets": [13],
"aTargets": [12],
"mData": "createTime",
"mRender": function (a, b, c, d) {
return formatDates(a);
......@@ -464,7 +479,7 @@
}
,
{
"aTargets": [14],
"aTargets": [13],
"mData": "id",
"mRender": function (a, b, c, d) {
var html = '#if($shiro.hasPermission("qy:order:edit"))';
......@@ -476,14 +491,14 @@
'</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.productName || c.productName == '') {
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 == '1') {
html += '<li><a onclick="updateStatusSuccess(' + a + ',' + c.openid + ')">订单付款</a></li>';
html += '<li><a onclick="updateStatusSuccess(' + a + ')">订单付款</a></li>';
}
if (c.status != '4' && c.status != '5') {
html += '<li><a onclick="updateStatus(' + a + ')">订单关闭</a></li>';
html += '<li><a onclick="showModal(' + a + ')">订单关闭</a></li>';
}
if (c.status == '2') {//待发货才可以出库操作
html += '<li><a href="#springUrl("/a/order/sendOut?id=' + a + '")">订单出库</a></li>';
......@@ -516,14 +531,18 @@
Cfapp.init();
function updateStatus(id) {
function showModal(id) {
$("#orderId").val(id);
$('#exampleModal').modal('show');
}
function updateStatusSuccess(id) {
Cfapp.confirm({
message: "是否确认关闭",
message: "是否确认付款",
btntext: "确定",
btncanceltext: "取消",
success: function () {
updateStatu(id, null, 5);
updateStatu(id, 3, null);//付款待发货
},
cancel: function () {
location.href = "#springUrl('/a/order/list')";
......@@ -531,33 +550,35 @@
});
}
function updateStatusSuccess(id, openid) {
Cfapp.confirm({
message: "是否确认付款",
function review() {
var reason = $("#js-textarea").val();
var id = $("#orderId").val();
if (!reason || reason == null) {
Cfapp.alert({
message: "请输入关闭原由!",
btntext: "确定",
btncanceltext: "取消",
success: function () {
updateStatu(id, openid, 3);//付款待发货
},
cancel: function () {
location.href = "#springUrl('/a/order/list')";
}
success: function () {}
});
return;
}
updateStatu(id, 5, reason);
}
function updateStatu(id, openid, status) {
function updateStatu(id, status, reason) {
var url = "#springUrl('/a/order/updateStatus')"
$.ajax({
url: url,
type: "GET",
data: {id: id,
openid: openid,
orderCancel: reason,
status: status},
success: function (rsp) {
console.log(rsp);
if (status == '5') {
$('#exampleModal').modal('hide');
}
if (rsp.errorNo == "0") {
Cfapp.alert({
message: "设置成功",
message: "操作成功",
btntext: "确定",
success: function () {
location.href = "#springUrl('/a/order/list')";
......@@ -565,7 +586,7 @@
});
} else {
Cfapp.alert({
message: "设置失败",
message: "操作失败",
btntext: "确定",
success: function () {
location.href = "#springUrl('/a/order/list')";
......@@ -609,6 +630,8 @@
});
}
function importExcel() {
var templateExcelUrl = "#springUrl('/a/order/templateExcel')";
var importExcelUrl = "#springUrl('/a/order/importExcel')";
......
aidea-modules/order-module/src/main/java/com/cftech/order/dao/OrderMapper.java
View file @ 2b2a6143
......@@ -75,4 +75,11 @@ public interface OrderMapper extends GenericDao<Order> {
* @Param
**/
List<OrderMobile> orderList(OrderMobileDto orderMobileDto);
/**
* 是否三期用户
* @param openid
* @return
*/
Integer isThreeUsers(@Param("openid") String openid);
}
\ No newline at end of file
aidea-modules/order-module/src/main/java/com/cftech/order/dao/OrderMapper.xml
View file @ 2b2a6143
......@@ -141,7 +141,9 @@
o.create_time AS createTime,
o.confirm,
o.courier_number AS courierNumber,
o.address_des
o.address_des,
o.openid,
o.status
</sql>
<sql id="sqlColumnProduct">
......@@ -465,8 +467,11 @@
<update id="updateStatus" parameterType="java.util.Map">
update t_order
<set>
<if test="id!=null">
status = #{status}
<if test="status != null">
status = #{status},
</if>
<if test="orderCancel!=null and orderCancel != ''">
order_cancel = #{status}
</if>
</set>
where id= #{id}
......@@ -530,7 +535,8 @@
t.amount,
p.is_rs AS isrs,
p.product_img AS productImg,
p.format
p.format,
t.drugs_num drugsNum
FROM t_order_details t LEFT JOIN t_aidea_product p ON t.drugs_id = p.id
WHERE t.del_flag = 0
<if test="orderId!=null">
......@@ -590,4 +596,8 @@
</if>
</select>
<select id="isThreeUsers" resultType="java.lang.Integer">
SELECT COUNT(1) FROM wx_mp_fanss f INNER JOIN wx_mp_member m ON f.openid = m.open_id
WHERE f.delflag = '0' AND m.del_flag = '0' AND m.compan = '0' AND m.open_id = #{openid}
</select>
</mapper>
\ No newline at end of file
aidea-modules/order-module/src/main/java/com/cftech/order/model/Order.java
View file @ 2b2a6143
......@@ -52,7 +52,7 @@ public class Order extends OrderDetail implements Serializable {
@ExportConfig(value = "订单取消原因", width = 100, showLevel = 1)
private String orderCancel;
/* 卖家备注 */
@ExportConfig(value = "卖家备注", width = 100, showLevel = 1)
@ExportConfig(value = "remarks", width = 100, showLevel = 1)
private String remarks;
/* 所属的账号 */
private Long accountsId;
......
aidea-modules/order-module/src/main/java/com/cftech/order/model/OrderFromVO.java
View file @ 2b2a6143
......@@ -30,6 +30,8 @@ public class OrderFromVO {
private String orderCancel;
private Double price;
private Double amount;
private String openid;
private String status;
}
aidea-modules/order-module/src/main/java/com/cftech/order/model/ProductMobile.java
View file @ 2b2a6143
......@@ -19,6 +19,8 @@ public class ProductMobile {
private String productImg;
/*商品规格*/
private String format;
/*商品规格*/
private Long drugsNum;
}
aidea-modules/order-module/src/main/java/com/cftech/order/service/OrderService.java
View file @ 2b2a6143
......@@ -36,7 +36,7 @@ public interface OrderService extends GenericService<Order> {
List<OrderFromVO> fetchProductId(Serializable id);
Integer updateStatus(Long id, String status);
Integer updateStatus(Long id, String status, String orderCancel);
JSONObject newlyAdded(String datas, Long accountsId);
......@@ -69,4 +69,9 @@ public interface OrderService extends GenericService<Order> {
**/
JSONObject orderList(OrderMobileDto orderMobileDto);
/**
*
* @param openid
*/
Integer isThreeUsers(String openid);
}
aidea-modules/order-module/src/main/java/com/cftech/order/service/impl/OrderServiceImpl.java
View file @ 2b2a6143
......@@ -85,10 +85,11 @@ public class OrderServiceImpl extends GenericServiceImpl<Order> implements Order
}
@Override
public Integer updateStatus(Long id, String status) {
public Integer updateStatus(Long id, String status, String orderCancel) {
Map<String, Object> params = new HashMap<>();
params.put("id", id);
params.put("status", status);
params.put("orderCancel", orderCancel);
return orderMapper.updateStatus(params);
}
......@@ -102,7 +103,6 @@ public class OrderServiceImpl extends GenericServiceImpl<Order> implements Order
JSONArray jsonArray = JSONArray.parseArray(datas);
try {
if (jsonArray.size() > 0) {
for (int i = 0; i < jsonArray.size(); i++) {
JSONObject jsonObject = jsonArray.getJSONObject(i);
long id = jsonObject.getLong("id");
......@@ -122,12 +122,16 @@ public class OrderServiceImpl extends GenericServiceImpl<Order> implements Order
params.put("idDetail", idDetail);
if (!"".equals(idDetail)) {
orderMapper.updateDetill(params);
Order newOrder = orderMapper.fetchOrder(id);
newOrder.setStatus("1");
newOrder.setOrderAmount(orderAmount);
orderMapper.update(newOrder);
rtnJson.put("errorNo", "0");
return rtnJson;
} else {
ProductDto productDtos = orderMapper.fetchProduct(params);
orderDetailDto = new OrderDetailDto();
Order orders = orderMapper.fetchOrder(id);
String number = orders.getNumber();
orderDetailDto = new OrderDetailDto();
orderDetailDto.setOrderCode(orders.getNumber());
orderDetailDto.setOrderId(id);
orderDetailDto.setDrugsId(productDtos.getId());
......@@ -139,30 +143,22 @@ public class OrderServiceImpl extends GenericServiceImpl<Order> implements Order
orderDetailDto.setDrugsSku(productDtos.getFormat());
orderDetailDto.setAccountsId(accountsId);
Integer detill = orderMapper.saveDetill(orderDetailDto);
if (detill < 0) {
rtnJson.put("errorNo", "1");
rtnJson.put("errorNo", "修改失败");
} else {
if (detill > 0) {
Integer integer = orderMapper.updateOrder(params);
if (integer > 0) {
rtnJson.put("errorNo", "0");
rtnJson.put("errorMsg", "修改成功");
}
}
}
}
//修改订单待付款
Order newOrder = orderMapper.fetchOrder(id);
newOrder.setStatus("1");
newOrder.setOrderAmount(orderAmount);
orderMapper.update(newOrder);
rtnJson.put("errorNo", "0");
rtnJson.put("errorMsg", "修改成功");
return rtnJson;
}
}
}
} catch (Exception e) {
e.printStackTrace();
rtnJson.put("errorNo", "1");
}
rtnJson.put("errorNo", "1");
return rtnJson;
}
......@@ -188,11 +184,6 @@ public class OrderServiceImpl extends GenericServiceImpl<Order> implements Order
rtnJson.put("errorMsg", "openid不能为空");
return rtnJson;
}
if (orderMobileDto.getStatus() == null) {
rtnJson.put("errorNo", "1");
rtnJson.put("errorMsg", "status不能为空");
return rtnJson;
}
List<OrderMobile> orderMobiles = orderMapper.orderFall(orderMobileDto);
for (OrderMobile orderMobile : orderMobiles) {
......@@ -273,4 +264,9 @@ public class OrderServiceImpl extends GenericServiceImpl<Order> implements Order
return rtnJson;
}
@Override
public Integer isThreeUsers(String openid) {
return orderMapper.isThreeUsers(openid);
}
}
\ No newline at end of file
aidea-modules/order-module/src/main/java/com/cftech/order/web/OrderController.java
View file @ 2b2a6143
......@@ -54,8 +54,10 @@ public class OrderController {
public static final String ORDER_VIEW = "qy:order:view";
public static final String ORDER_EDIT = "qy:order:edit";
public static final DoubleJSONFilter DOUBLE_JSON_FILTER = new DoubleJSONFilter();
@Autowired
private OrderService orderService;
@Autowired
private OrderDetailsController orderDetailsController;
......@@ -73,12 +75,21 @@ public class OrderController {
@RequestMapping("/form")
public String form(HttpServletRequest request, String id, Model model) {
if (!StringUtils.isEmpty(id)) {
OrderFromVO orderFromVO = orderService.fetchId(id);
List<OrderFromVO> fromVO = orderService.fetchProductId(id);
OrderFromVO orderFromVO = orderService.fetchId(id);//订单信息
JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(orderFromVO));
String jsonArray = JSON.toJSONString(fromVO, DOUBLE_JSON_FILTER, SerializerFeature.WriteMapNullValue);
model.addAttribute("data", jsonObject);
List<OrderFromVO> fromVO = orderService.fetchProductId(id);//获取订单产品明细数据
String jsonArray = JSON.toJSONString(fromVO, DOUBLE_JSON_FILTER, SerializerFeature.WriteMapNullValue);
model.addAttribute("list", jsonArray);
Integer i = orderService.isThreeUsers(orderFromVO.getOpenid());
if (i > 0) {
model.addAttribute("isThree", "0");
} else {
model.addAttribute("isThree", "1");
}
}
return "order/orderform";
}
......@@ -124,7 +135,7 @@ public class OrderController {
@RequestMapping(value = "/listData")
@ResponseBody
public JSONObject listData(int iDisplayStart, int iDisplayLength, Order order, HttpServletRequest request) {
Long userid = UserUtils.getUser().getId();
Long userid = UserUtils.getUser().getUserid();
Long accountsId = UserUtils.getmpaccounts(request);
Conds conds = new Conds();
......@@ -283,9 +294,9 @@ public class OrderController {
@RequestMapping("/updateStatus")
@ResponseBody
public JSONObject updateStatus(Long id, String openid, String status, HttpServletRequest request) {
public JSONObject updateStatus(Long id, String status, String orderCancel, HttpServletRequest request) {
JSONObject rtnJson = new JSONObject();
Integer integer = orderService.updateStatus(id, status);
Integer integer = orderService.updateStatus(id, status, orderCancel);
//设置已付款
if (integer > 0){
rtnJson.put("errorNo","0");
......
cftech-common-web/src/main/resources/common-test.properties
View file @ 2b2a6143
......@@ -40,7 +40,7 @@ LOG_URL=http://www.michang-tech.com.cn:6989/log/addlog
#\u6821\u9A8C\u5151\u6362\u5BC6\u7801KEY
MEMBER_PASSWORD_KEY=DONGCHANGINT9527;
list.refreshtoken=true
jwt.domain=127.0.0.1
jwt.domain=pd.shxrtech.com
#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
jwt.duration=86400000
#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u03AAtrue
......
cms-modules/cms-core-module/src/main/java/com/cftech/cms/cfarticle/web/MobileCfArticleController.java
View file @ 2b2a6143
......@@ -176,6 +176,6 @@ public class MobileCfArticleController {
**/
@RequestMapping(value = "/columnDetails", method = {RequestMethod.GET, RequestMethod.POST}, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public com.alibaba.fastjson.JSONObject columnDetails(Long id,String appId,Long page,Long pageSize,String title){
return cfarticleService.columnDetails(id,appId,page,pageSize,title);
return cfarticleService.columnDetails(id, appId, page, pageSize, title);
}
}
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