记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 9dab576f authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

Merge remote-tracking branch 'origin/dev_20111115' into dev_20111115

parents 7204a8a5 9418d3ca
Show whitespace changes
Inline Side-by-side
Showing with 282 additions and 9 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/tools/ToolsBaseController.java
View file @ 9dab576f
......@@ -8,12 +8,19 @@ import com.liquidnet.client.admin.zhengzai.kylin.dto.OrderExportVo;
import com.liquidnet.client.admin.zhengzai.kylin.dto.OrderOutLineVo;
import com.liquidnet.client.admin.zhengzai.kylin.service.IExportService;
import com.liquidnet.client.admin.zhengzai.kylin.service.IToolService;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
import com.liquidnet.service.kylin.entity.KylinOrderTicketEntities;
import org.bson.Document;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.core.query.Update;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
import com.liquidnet.service.kylin.entity.KylinOrderTickets;
import java.util.ArrayList;
import java.util.List;
......@@ -26,7 +33,8 @@ public class ToolsBaseController extends BaseController {
private IExportService exportService;
@Autowired
private IToolService toolService;
@Autowired
MongoTemplate mongoTemplate;
@GetMapping()
public String tools() {
return prefix + "/tools";
......@@ -48,6 +56,10 @@ public class ToolsBaseController extends BaseController {
mmap.put("url_info", "/tools/order/enter");
mmap.put("url_single", "/tools/order/getSingleEnter");
return prefix + "/fun2";//订单修改入场人
} else if (id == 3) {
mmap.put("url_info", "/tools/order/getContacts");
mmap.put("url_single", "/tools/order/getSingleContacts");
return prefix + "/fun3";//订单查询
} else {
return prefix + "/edit";
}
......@@ -129,4 +141,52 @@ public class ToolsBaseController extends BaseController {
public AjaxResult getOrderTicketEnterByOrderCode(String orderTicketEntitiesId, String enterName, String enterMobile, String enterIdCode, Integer enterType, String orderId) {
return AjaxResult.success(toolService.supplementEnter(orderTicketEntitiesId, enterName, enterMobile, enterIdCode, enterType, orderId));
}
/**
* 根据订单号获取收货人信息
*
* @param orderCode
* @return
*/
@PostMapping("/order/getContacts")
@ResponseBody
public TableDataInfo getExpressContactsByOrderCode(String orderCode, ModelMap mmap) {
TableDataInfo rspData = new TableDataInfo();
rspData.setCode(0);
List<KylinOrderTickets> data = toolService.getExpressContactsByOrderCode(orderCode);
if (data != null){
rspData.setRows(data);
rspData.setTotal(data.size());
}else {
rspData.setRows(new ArrayList<>());
rspData.setTotal(0);
}
return rspData;
}
/**
* 修改收货人信息
*
* @param orderCode
* @return
*/
@GetMapping("/order/getSingleContacts/{orderCode}")
public String getSingleContacts(@PathVariable("orderCode") String orderCode, ModelMap mmap) {
List<KylinOrderTickets> data = toolService.getExpressContactsByOrderCode(orderCode);
mmap.put("dataInfo", data.get(0));
mmap.put("url_change", "/tools/order/expressPhoneChange");
return prefix + "/fun3Details";
}
/**
* 修改收货人手机号
*
* @param orderCode
* @param expressPhone
* @return
*/
@PostMapping("/order/expressPhoneChange")
@ResponseBody
public AjaxResult updOrderExpressPhoneByOrderCode(String orderCode,String expressPhone) {
return AjaxResult.success(toolService.updOrderExpressPhoneByOrderCode(orderCode, expressPhone));
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/tools/fun3.html 0 → 100644
View file @ 9dab576f
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('工具库')"/>
</head>
<body class="white-bg">
<div class="form-horizontal m wrapper wrapper-content animated fadeInRight ibox-content">
<div class="col-sm-12 search-collapse">
<form id="formId">
<div class="select-list">
<ul>
<li>
<label>订单号：</label>
<input type="text" name="orderCode"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
class="fa fa-refresh"></i>重置</a>
</li>
</ul>
</div>
</form>
</div>
<div class="form-group">
<table id="bootstrap-table"></table>
</div>
</div>
<th:block th:include="include :: footer"/>
<script th:inline="javascript">
var certificateType = [[${@dict.getType('zhengzai_certificate_type')}]];
var options = {
url: [[${url_info}]],
modalName: "入场人信息",
orderSc: "desc",
orderItem: "created_at",
updateUrl: [[${url_single}]] + "/{id}",
columns: [
{
field: 'expressContacts',
title: '收货人'
}, {
field: 'expressAddress',
title: '收货地址'
}, {
field: 'expressPhone',
title: '收货人联系方式'
},
{
title: '操作',
align: 'center',
formatter: function (value, rows, index) {
console.log(rows);
var actions = [];
actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.operate.edit(\'' + rows.orderCode + '\')"><i class="fa fa-edit"></i>修改</a> ');
return actions.join('');
}
}]
};
$.table.init(options);
// }
</script>
</body>
</html>
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/tools/fun3Details.html 0 → 100644
View file @ 9dab576f
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('工具库')"/>
</head>
<body class="white-bg">
<div class="form-horizontal m wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-fun2Details-edit"
th:object="${dataInfo}">
<div class="form-group">
<label class="col-sm-3 control-label is-required">订单编号：</label>
<div class="col-sm-8">
<input name="orderId" th:field="*{orderCode}" class="form-control" type="text"
required readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">收货人：</label>
<div class="col-sm-8">
<input name="orderTicketEntitiesId" th:field="*{expressContacts}" class="form-control" type="text"
required readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">收货地址：</label>
<div class="col-sm-8">
<input name="orderId" th:field="*{expressAddress}" class="form-control" type="text"
required readonly>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">收货人联系方式：</label>
<div class="col-sm-8">
<input name="enterName" th:field="*{expressPhone}" class="form-control" type="text" ly>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer"/>
<script th:inline="javascript">
$("#form-fun2Details-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save([[${url_change}]], $('#form-fun2Details-edit').serialize());
}
}
</script>
</body>
</html>
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/tools/tools.html
View file @ 9dab576f
......@@ -28,6 +28,11 @@
修改订单入场人
</button>
<button id="fun3" type="button" class="btn btn-w-m btn-success" href="javascript:void(0)"
onclick="$.operate.detail(3)">
订单查询
</button>
</div>
</form>
</div>
......@@ -43,12 +48,16 @@
$.table.init(options);
var fun1Flag = [[${@permission.hasPermi('tools:fun1')}]];
var fun2Flag = [[${@permission.hasPermi('tools:fun2')}]];
var fun3Flag = [[${@permission.hasPermi('tools:fun3')}]];
if (fun1Flag == "hidden") {
document.getElementById("fun1").style.display = "none";
}
if (fun2Flag == "hidden") {
document.getElementById("fun2").style.display = "none";
}
if (fun3Flag == "hidden") {
document.getElementById("fun3").style.display = "none";
}
</script>
</body>
</html>
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/IToolService.java
View file @ 9dab576f
package com.liquidnet.client.admin.zhengzai.kylin.service;
import com.liquidnet.service.kylin.entity.KylinOrderTicketEntities;
import com.liquidnet.service.kylin.entity.KylinOrderTickets;
import java.util.List;
......@@ -32,4 +34,13 @@ public interface IToolService {
* @return
*/
List<KylinOrderTicketEntities> getOrderTicketEnterByOrderCode(String orderCode);
/**
* 根据订单号获取收货人信息
*
* @param orderCode
* @return
*/
List<KylinOrderTickets> getExpressContactsByOrderCode(String orderCode);
Integer updOrderExpressPhoneByOrderCode(String orderCode, String expressPhone);
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/ToolServiceImpl.java
View file @ 9dab576f
package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.fasterxml.jackson.core.type.TypeReference;
import com.liquidnet.client.admin.zhengzai.kylin.dto.ChangeOrderEnterResp;
import com.liquidnet.client.admin.zhengzai.kylin.service.IToolService;
import com.liquidnet.client.admin.zhengzai.kylin.utils.DataUtils;
import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.kylin.constant.KylinRedisConst;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
import com.liquidnet.service.kylin.entity.KylinOrderTicketEntities;
import com.liquidnet.service.kylin.entity.KylinOrderTickets;
import com.liquidnet.service.kylin.mapper.KylinOrderTicketEntitiesMapper;
import com.liquidnet.service.kylin.mapper.KylinOrderTicketVoMapper;
import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper;
import lombok.extern.slf4j.Slf4j;
import org.bson.Document;
......@@ -19,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.core.query.Update;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime;
......@@ -36,6 +39,8 @@ public class ToolServiceImpl implements IToolService {
private KylinOrderTicketEntitiesMapper kylinOrderTicketEntitiesMapper;
@Autowired
private KylinOrderTicketsMapper kylinOrderTicketsMapper;
@Autowired
private KylinOrderTicketVoMapper kylinOrderTicketVoMapper;
@Override
public Boolean supplementEnter(String orderTicketEntitiesId, String enterName, String enterMobile, String enterIdCode, Integer enterType, String orderId) {
......@@ -76,4 +81,28 @@ public class ToolServiceImpl implements IToolService {
List<KylinOrderTicketEntities> entitiesList = kylinOrderTicketEntitiesMapper.selectList(Wrappers.lambdaUpdate(KylinOrderTicketEntities.class).eq(KylinOrderTicketEntities::getOrderId, orderId));
return entitiesList;
}
@Override
public List<KylinOrderTickets> getExpressContactsByOrderCode(String orderCode) {
List<KylinOrderTickets> KylinOrderTickets = kylinOrderTicketVoMapper.getExpressContactsByOrderCode(orderCode);
return KylinOrderTickets;
}
@Autowired
private RedisDataSourceUtil redisDataSourceUtil;
@Override
public Integer updOrderExpressPhoneByOrderCode(String orderCode, String expressPhone) {
int upd = kylinOrderTicketVoMapper.updOrderExpressPhoneByOrderCode(orderCode, expressPhone);
//存mongo
Query query = Query.query(Criteria.where("orderCode").is(orderCode));
Update update = Update.update("expressPhone",expressPhone);;
mongoTemplate.updateFirst(query,update,KylinOrderTicketVo.class,KylinOrderTicketVo.class.getSimpleName());
//存redis
String redisK = KylinRedisConst.ORDER + orderCode;
KylinOrderTicketVo orderTicketVo = mongoTemplate.findOne(query, KylinOrderTicketVo.class, KylinOrderTicketVo.class.getSimpleName());
redisDataSourceUtil.getRedisKylinUtil().set(redisK, orderTicketVo);
// Object o = redisDataSourceUtil.getRedisKylinUtil().get(redisK);
return upd;
}
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinOrderTicketVoMapper.java 0 → 100644
View file @ 9dab576f
package com.liquidnet.service.kylin.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.liquidnet.service.kylin.entity.KylinOrderTickets;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
*
* 订单详情 Mapper 接口
*
*
*/
public interface KylinOrderTicketVoMapper extends BaseMapper<KylinOrderTickets> {
//根据订单号查询收货人信息
List<KylinOrderTickets> getExpressContactsByOrderCode(String orderCode);
int updOrderExpressPhoneByOrderCode(@Param("orderCode") String orderCode,@Param("expressPhone") String expressPhone);
}
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketVoMapper.xml 0 → 100644
View file @ 9dab576f
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.liquidnet.service.kylin.mapper.KylinOrderTicketVoMapper">
<select id="getExpressContactsByOrderCode" resultType="com.liquidnet.service.kylin.entity.KylinOrderTickets">
SELECT order_code,express_contacts,express_address,express_phone
FROM kylin_order_tickets
<where>
order_code = #{orderCode}
</where>
</select>
<update id="updOrderExpressPhoneByOrderCode" >
update kylin_order_tickets
<set>
express_phone = #{expressPhone}
</set>
where order_code = #{orderCode}
</update>
</mapper>
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml
View file @ 9dab576f
......@@ -344,7 +344,7 @@
</if>
<if test="expressStatus == 80">AND (oe.express_status = 80 OR oe.express_status = 8000)</if>
<if test="mailno != ''">AND oe.mailno LIKE concat('%', #{mailno}, '%')</if>
<if test="ticketsId != '' and ticketsId != null">AND kotr.ticket_id = ${ticketsId} </if>
<if test="ticketsId != '' and ticketsId != null">AND kotr.ticket_id = ${ticketsId}</if>
</where>
ORDER BY kot.mid DESC
</select>
......@@ -399,7 +399,7 @@
<select id="getOrderScore" resultType="Integer">
select sum(price_actual) from kylin_order_tickets kot
select IFNULL(sum(price_actual),0) from kylin_order_tickets kot
inner join kylin_order_ticket_relations as kotr on kotr.order_id = kot.order_tickets_id
inner join kylin_order_ticket_status as kots on kots.order_id = kot.order_tickets_id
inner join kylin_order_ticket_entities as kote on kote.order_id = kot.order_tickets_id
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/kylin/DataImpl.java
View file @ 9dab576f
......@@ -98,7 +98,11 @@ public class DataImpl {
//获取商品每日任务积分
String resultData = HttpUtil.get("http://devmall.zhengzai.tv/admin/sumUserCost?user_id=" + 1, null);
int goodsPrice = (int) JSONObject.parseObject(resultData).get("cost");
try {
score += (goodsPrice / 100);
}catch (Exception e){
}
//获取 关注摩登天空服务号
if (getUnionIdByPhone(mobile) != null) {
......
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