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
Expand all Show 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 @@
<sql id="sqlColumns">
a.id,
a.consult_id,
CONVERT(AES_DECRYPT(a.user_name,'aideakey') USING UTF8),
CONVERT(AES_DECRYPT(a.number_id,'aideakey') USING UTF8),
CONVERT(AES_DECRYPT(a.user_name,'aideakey') USING UTF8) ,
CONVERT(AES_DECRYPT(a.number_id,'aideakey') USING UTF8) ,
a.sex,
CONVERT(AES_DECRYPT(a.iphone,'aideakey') USING UTF8),
CONVERT(AES_DECRYPT(a.iphone,'aideakey') USING UTF8) ,
a.past_records,
a.prescription,
a.doctor_id,
......
aidea-modules/order-module-web/src/main/webapp/WEB-INF/views/order/orderlist.html
View file @ da850ac0
......@@ -80,7 +80,7 @@
<div class="col-xs-2">
<input type="text" class="form-control "
name="orderCode" placeholder="订单编号">
name="number" placeholder="订单编号">
</div>
<div class="col-xs-2">
<input type="text" class="form-control "
......@@ -105,7 +105,7 @@
<th>订单编码</th>
<th>产品名称</th>
<th>订单金额</th>
<th>订单总价</th>
<th>付款金额</th>
<th>收货地址</th>
<th>快递单号</th>
<th>订单状态</th>
......@@ -209,19 +209,17 @@
"mData": "id"
},
{
"mData": "orderCode"
"mData": "number"
},
{
"mData": "productName"
}
,
},
{
"mData": "payAmount"
"mData": "orderAmount"
}
,
{
"mData": "orderAmount"
"mData": "totalAmount"
}
,
{
......@@ -261,7 +259,7 @@
},
{
"aTargets": [1],
"mData": "orderCode",
"mData": "number",
"mRender": function (a, b, c, d) {
return a;
}
......@@ -277,7 +275,7 @@
,
{
"aTargets": [3],
"mData": "payAmount",
"mData": "orderAmount",
"mRender": function (a, b, c, d) {
return a;
}
......@@ -285,7 +283,7 @@
,
{
"aTargets": [4],
"mData": "orderAmount",
"mData": "totalAmount",
"mRender": function (a, b, c, d) {
return a;
}
......@@ -359,6 +357,7 @@
'</button>\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/sendOut?id=' + a + '")">订单出库</a></li>';
html += '</ul>';
html += '#end';
return html;
......
aidea-modules/order-module/src/main/java/com/cftech/order/dao/OrderMapper.xml
View file @ da850ac0
......@@ -4,7 +4,6 @@
<resultMap id="resultMap" type="com.cftech.order.model.Order">
<id column="id" property="id"/>
<result column="order_code" property="orderCode"/>
<result column="consult_id" property="consultId"/>
<result column="number" property="number"/>
<result column="member_id" property="memberId"/>
......@@ -38,7 +37,6 @@
<resultMap id="resultMapList" type="com.cftech.order.model.Order">
<id column="id" property="id"/>
<result column="order_code" property="orderCode"/>
<result column="consult_id" property="consultId"/>
<result column="number" property="number"/>
<result column="member_id" property="memberId"/>
......@@ -102,13 +100,13 @@
<sql id="sqlColumns">
o.id,
o.order_code,
t.product_number,
o.consult_id,
t.product_name,
o.number,
o.pay_amount,
o.order_amount,
o.total_amount,
o.pay_status,
o.order_cancel,
o.trade_no,
......@@ -119,14 +117,12 @@
o.confirm,
d.drugs_num,
o.courier_number,
CONCAT(a.areaname,
b.areaname,
c.areaname,s.address) as address,
CONCAT(a.areaname, b.areaname, c.areaname,s.address) as address,
t.id as productId
</sql>
<sql id="sqlColumnFrom">
o.id,
o.order_code AS orderCode,
o.consult_id AS consultId,
o.number,
o.pay_amount AS payAmount,
......@@ -154,7 +150,6 @@
<sql id="Column">
order_id,
order_code,
drugs_id,
drugs_num,
openid,
......@@ -163,7 +158,6 @@
drugs_code,
drugs_sku,
accounts_id
</sql>
......@@ -195,7 +189,6 @@
#{status, jdbcType=VARCHAR},
now(),
now()
)
</insert>
......@@ -249,13 +242,13 @@
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
<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="limit>0">limit #{offset},#{limit}</if>
</select>
<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>
<update id="update" parameterType="com.cftech.order.model.Order">
update t_order
......@@ -342,7 +335,7 @@
<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>
<insert id="saveDetill" parameterType="com.cftech.order.model.OrderDetailDto" >
<insert id="saveDetill" parameterType="com.cftech.order.model.OrderDetailDto">
insert into t_order_details
(
<include refid="Column"/>
......@@ -350,7 +343,6 @@
values
(
#{orderId},
#{orderCode},
#{drugsId},
#{drugsNum},
#{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;
* @author Licc
* @date: 2020-10-10 14:20
*/
public class Order extends OrderDetail implements Serializable {
/* 主键id */
private Long id;
/* 订单编码 */
@ExportConfig(value = "订单编码", width = 100, showLevel = 1)
private String orderCode;
/* 咨询单id */
@ExportConfig(value = "咨询单id", width = 100, showLevel = 1)
private Long consultId;
/* 咨询单编码 */
@ExportConfig(value = "咨询单编码", width = 100, showLevel = 1)
/* 订单编码 */
@ExportConfig(value = "订单编码", width = 100, showLevel = 1)
private String number;
/* 所属会员id */
@ExportConfig(value = "所属会员id", width = 100, showLevel = 1)
......@@ -114,16 +110,6 @@ public class Order extends OrderDetail implements Serializable {
this.id = id;
}
@Override
public String getOrderCode() {
return orderCode;
}
@Override
public void setOrderCode(String orderCode) {
this.orderCode = orderCode;
}
public Long getConsultId() {
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 {
/* 订单id */
@ExportConfig(value = "订单id", width = 100, showLevel = 1)
private Long orderId;
/* 订单编码 */
@ExportConfig(value = "订单编码", width = 100, showLevel = 1)
private String orderCode;
/* 商品id */
@ExportConfig(value = "商品id", width = 100, showLevel = 1)
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;
public class OrderDetailDto {
/* 订单id */
private Long orderId;
/* 订单编码 */
private String orderCode;
/* 商品id */
private Long drugsId;
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;
@Data
public class OrderFromVO {
private Long id;
private String orderCode;
private String number;
private String courierNumber;
private String productNumber;
private String productName;
private Long productId;
private Long drugsNum;
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;
*/
@Data
public class OrderVO {
/* 订单编码 */
@ExportConfig(value = "订单编码", width = 100, showLevel = 1)
private String orderCode;
/* 产品编码 */
@ExportConfig(value = "商品编码",width = 100,showLevel = 1)
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
orderDetailDto = new OrderDetailDto();
Order orders = orderMapper.fetchOrder(id);
orderDetailDto.setOrderId(id);
orderDetailDto.setOrderCode(orders.getOrderCode());
orderDetailDto.setDrugsId(productDtos.getId());
orderDetailDto.setOpenid(orders.getOpenid());
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;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONAware;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.cftech.order.model.Order;
......@@ -17,12 +16,11 @@ import com.cftech.core.util.Constants;
import com.cftech.order.utils.DoubleJSONFilter;
import com.cftech.sys.security.UserUtils;
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.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
......@@ -76,19 +74,35 @@ public class OrderController {
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);
String jsonArray = JSON.toJSONString(fromVO, DOUBLE_JSON_FILTER, SerializerFeature.WriteMapNullValue);
model.addAttribute("data", jsonObject);
model.addAttribute("list", jsonArray);
}
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")
@ResponseBody
public JSONObject fromProduct(){
public JSONObject fromProduct() {
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();
object.put("data",jsonArray);
object.put("data", jsonArray);
return object;
}
......@@ -97,7 +111,7 @@ public class OrderController {
@RequiresPermissions(value = ORDER_EDIT)
@PostMapping(value = "/formData", produces = {"application/json;charset=utf-8"})
@ResponseBody
public JSONObject formData(HttpServletRequest request,String datas) {
public JSONObject formData(HttpServletRequest request, String datas) {
Long accountsId = UserUtils.getmpaccounts(request);
JSONObject jsonObject = orderService.newlyAdded(datas, accountsId);
return jsonObject;
......@@ -114,14 +128,14 @@ public class OrderController {
conds.equal("o.del_flag", Constants.DEL_FLAG_0);
conds.equal("o.accounts_id", accountsId);
Sort sort = new Sort("o.create_time", OrderType.DESC);
if(!StringUtils.isEmpty(order.getOrderCode())){
conds.like("o.order_code",order.getOrderCode()) ;
if (!StringUtils.isEmpty(order.getNumber())) {
conds.like("o.order_code", order.getNumber());
}
if (!StringUtils.isEmpty(order.getProductName())){
conds.like("t.product_name",order.getProductName());
if (!StringUtils.isEmpty(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);
JSONObject rtnJson = new JSONObject();
rtnJson.put("iTotalRecords", counts);
......@@ -156,9 +170,8 @@ public class OrderController {
List<Order> list = orderService.fetchSearchByPage(conds, sort, 0, 0);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
LinkedList<OrderVO> orderVOS = new LinkedList<>();
for(Order order :list){
for (Order order : list) {
OrderVO orderVO = new OrderVO();
orderVO.setOrderCode(order.getOrderCode());
orderVO.setProductNumber(order.getProductNumber());
orderVO.setProductName(order.getProductName());
orderVO.setOrderAmount(order.getOrderAmount());
......@@ -185,7 +198,7 @@ public class OrderController {
if (file == null) {
return list(request, model);
}
// 构造临时路径来存储上传的文件
// 构造临时路径来存储上传的文件
String uploadPath = System.getProperty("java.io.tmpdir");
File uploadDir = new File(uploadPath);
if (!uploadDir.exists()) {
......
aidea-modules/product-module-web/src/main/webapp/WEB-INF/views/product/productform.html
View file @ da850ac0
......@@ -320,7 +320,7 @@
$("#columnSelect").click(function () {
Cfapp.f7({
dataUrl: classify,
checkType: 'single', // 多选为multi
checkType: 'multi', // 多选为multi
title: "选择产品分类",
btnoktext: "确定",
btncanceltext: "取消",
......
cftech-common-web/src/main/resources/redis-config-test.properties
View file @ da850ac0
......@@ -2,12 +2,12 @@
# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
spring.redis.database=15
# 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
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
spring.redis.port=6379
# 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==
# \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
......
sys-module-web/src/main/webapp/WEB-INF/views/manageuser/userupdate.html
View file @ da850ac0
......@@ -200,7 +200,7 @@
<table id="table" class="table">
<thead>
<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:30%;"></th>
</tr>
......@@ -210,7 +210,7 @@
</tbody>
</table>
</div>
<button type="button" class="btn btn-info" id="addAccounts">添加公众号</button>
<!--<button type="button" class="btn btn-info" id="addAccounts">添加公众号</button>-->
</div>
<div class="box-footer">
<input class="btn btn-primary" id="save" type="submit" value="保存">
......@@ -306,9 +306,9 @@
var rolehtml = $(".role").html();
var html = "";
html += "<tr class='trEle'>";
html += "<td>";
html += "<select class='form-control select2 account' data-placeholder='请选择公众号'>" + accounthtml;
html += "</select></td>";
// html += "<td>";
// html += "<select class='form-control select2 account' data-placeholder='请选择公众号'>" + accounthtml;
// html += "</select></td>";
html += "<td>";
html += "<select class='form-control select2 role' style='width:100%;' multiple='multiple' data-placeholder='请选择角色'>";
html += rolehtml;
......@@ -338,9 +338,9 @@
var rolehtml = $(".qyrole").html();
var html = "";
html += "<tr class='trEle'>";
html += "<td>";
html += "<select class='form-control select2 qyaccount' data-placeholder='请选择公众号'>" + accounthtml;
html += "</select></td>";
// html += "<td>";
// html += "<select class='form-control select2 qyaccount' data-placeholder='请选择公众号'>" + accounthtml;
// html += "</select></td>";
html += "<td>";
html += "<select class='form-control select2 qyrole' style='width:100%;' multiple='multiple' data-placeholder='请选择角色'>";
html += rolehtml;
......@@ -392,9 +392,9 @@
var rolehtml = $(".role").html();
var html = "";
html += "<tr class='trEle'>";
html += "<td>";
html += "<select class='form-control select2 account' data-placeholder='请选择公众号'>" + accounthtml;
html += "</select></td>";
// html += "<td>";
// html += "<select class='form-control select2 account' data-placeholder='请选择公众号'>" + accounthtml;
// html += "</select></td>";
html += "<td>";
html += "<select class='form-control select2 role' style='width:100%;' multiple='multiple' data-placeholder='请选择角色'>";
html += rolehtml;
......@@ -415,10 +415,10 @@
var rolehtml = $(".qyrole").html();
var html = "";
html += "<tr class='trEle'>";
html += "<td>";
html += "<select class='form-control select2 qyaccount' data-placeholder='请选择企业号'>" + accounthtml;
html += "</select></td>";
html += "<td>";
// html += "<td>";
// html += "<select class='form-control select2 qyaccount' data-placeholder='请选择企业号'>" + accounthtml;
// html += "</select></td>";
// html += "<td>";
html += "<select class='form-control select2 qyrole' style='width:100%;' multiple='multiple' data-placeholder='请选择角色'>";
html += rolehtml;
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