Skip to content

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

Aidea product update by Strive Date 2020-11-21

parent 938056ba
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 647 additions and 571 deletions
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/dao/ConsultSheetMapper.xml
View file @ 62f375f0
...@@ -108,7 +108,10 @@ ...@@ -108,7 +108,10 @@
allergy, allergy,
symptom, symptom,
open_id, open_id,
consult_id consultId consult_id consultId,
status,
drugs_id drugsId,
address_id addressId
</sql> </sql>
<insert id="save" parameterType="com.cftech.consultsheet.model.ConsultSheet" useGeneratedKeys="true" <insert id="save" parameterType="com.cftech.consultsheet.model.ConsultSheet" useGeneratedKeys="true"
...@@ -177,14 +180,14 @@ ...@@ -177,14 +180,14 @@
) )
</insert> </insert>
<select id="fetchById" parameterType="java.lang.Long" resultMap="com.cftech.consultsheet.model.ConsultSheet"> <select id="fetchById" parameterType="java.lang.Long" resultType="com.cftech.consultsheet.model.ConsultSheet">
SELECT 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 FROM t_aidea_consult_sheet a
LEFT JOIN t_qyuser b ON b.id = a.doctor_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 t_qyuser c ON c.id = a.service_id
LEFT JOIN t_qyuser d ON d.id = a.past_records LEFT JOIN t_qyuser d ON d.id = a.past_records
LEFT JOIN t_qyuser e ON e.id = a.allergy LEFT JOIN t_orgunit e ON e.id = a.allergy
WHERE a.id = #{id} WHERE a.id = #{id}
</select> </select>
......
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/service/impl/ConsultSheetServiceImpl.java
View file @ 62f375f0
...@@ -29,9 +29,6 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -29,9 +29,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.Statement;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
...@@ -116,10 +113,14 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im ...@@ -116,10 +113,14 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
consultSheet.setConsultId(codingruleUtils.getNumber(consultSheet.getAccountsId(), ConsultSheet.class.getName())); consultSheet.setConsultId(codingruleUtils.getNumber(consultSheet.getAccountsId(), ConsultSheet.class.getName()));
//处理处方单图片 //处理处方单图片
String fileName = mediaUtil.downloadMpMediaToDisk(mpAccountsEntity.getId(), "consultSheet", consultSheet.getPrescription()); if (StringUtils.isNoneBlank(consultSheet.getPrescription())) {
String url = SystemConfig.p.getProperty("QY_DOMAIN") + SystemConfig.p.getProperty("IMAGEURL").replace("{PICFILENAME}", fileName); if (!consultSheet.getPrescription().contains("http")) {
String fileName = mediaUtil.downloadMpMediaToDisk(mpAccountsEntity.getId(), "consultSheet", consultSheet.getPrescription());
String url = SystemConfig.p.getProperty("QY_DOMAIN") + SystemConfig.p.getProperty("IMAGEURL").replace("{PICFILENAME}", fileName);
consultSheet.setPrescription(url);
}
}
consultSheet.setAccountsId(mpAccountsEntity.getId()); consultSheet.setAccountsId(mpAccountsEntity.getId());
consultSheet.setPrescription(url);
if (consultSheetMapper.save(consultSheet) > 0) { if (consultSheetMapper.save(consultSheet) > 0) {
memberProcess(consultSheet.getOpenId(), consultSheet); memberProcess(consultSheet.getOpenId(), consultSheet);
...@@ -127,7 +128,7 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im ...@@ -127,7 +128,7 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
//展示客服二维码 //展示客服二维码
Qyuser serviceCus = qyuserService.fetchById(consultSheet.getServiceId()); Qyuser serviceCus = qyuserService.fetchById(consultSheet.getServiceId());
retObj.put("errorNo", 0); retObj.put("errorNo", 0);
retObj.put("data", serviceCus.getQrcode()); retObj.put("data", serviceCus.getDescription());
retObj.put("errorMsg", "咨询单提交成功，请等待药师审核"); retObj.put("errorMsg", "咨询单提交成功，请等待药师审核");
} else { } else {
retObj.put("errorNo", 1); retObj.put("errorNo", 1);
...@@ -176,31 +177,34 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im ...@@ -176,31 +177,34 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
conds.in("o.status", new String[]{"2", "3", "4"});//2 待发货，3：待收货 4:待付款 conds.in("o.status", new String[]{"2", "3", "4"});//2 待发货，3：待收货 4:待付款
int count = orderService.count(conds); int count = orderService.count(conds);
if (count > 0) { //复购 if (count > 0) { //复购
// Conds memberConds = new Conds(); Conds memberConds = new Conds();
// memberConds.equal("del_flag", Constants.DEL_FLAG_0); memberConds.equal("del_flag", Constants.DEL_FLAG_0);
// memberConds.equal("open_id", openid); memberConds.equal("open_id", openid);
// Member member = memberService.fetchSearchByConds(memberConds); Member member = memberService.fetchSearchByConds(memberConds);
// if (member == null) {
// String serviceId = member.getServiceId(); firstCustomerProcess(consultSheet);
// Conds userConds = new Conds(); }
// userConds.equal("t.del_flag", Constants.DEL_FLAG_0);
// userConds.equal("t.id", serviceId); String serviceId = member.getServiceId();
// Qyuser user = qyuserService.fetchSearchByConds(userConds); Conds userConds = new Conds();
// if (user.getPeakVal() > 0) {//客服峰值大于0 userConds.equal("t.del_flag", Constants.DEL_FLAG_0);
// consultSheet.setServiceId(user.getId()); userConds.equal("t.id", serviceId);
// //推送消息 Qyuser user = qyuserService.fetchSearchByConds(userConds);
// } else {//普通轮询 if (user.getPeakVal() > 0) {//客服峰值大于0
// firstCustomerProcess(consultSheet); consultSheet.setServiceId(user.getId());
// } //推送消息
// } else {//普通轮询
// String doctorId = member.getDoctorId();
// userConds.equal("t.id", doctorId);
// user = qyuserService.fetchSearchByConds(userConds);
// if (user.getPeakVal() > 0) {//药师峰值大于0
// consultSheet.setDoctorId(user.getId());
// } else {//普通轮询
firstCustomerProcess(consultSheet); firstCustomerProcess(consultSheet);
//} }
String doctorId = member.getDoctorId();
userConds.equal("t.id", doctorId);
user = qyuserService.fetchSearchByConds(userConds);
if (user.getPeakVal() > 0) {//药师峰值大于0
consultSheet.setDoctorId(user.getId());
} else {//普通轮询
firstCustomerProcess(consultSheet);
}
} else {//首次购买 } else {//首次购买
firstCustomerProcess(consultSheet); firstCustomerProcess(consultSheet);
} }
......
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/web/ConsultSheetController.java
View file @ 62f375f0
...@@ -273,12 +273,12 @@ public class ConsultSheetController { ...@@ -273,12 +273,12 @@ public class ConsultSheetController {
*/ */
@RequestMapping(value = "/updateData") @RequestMapping(value = "/updateData")
@ResponseBody @ResponseBody
public JSONObject updateData(String consultId, String status, String description ,HttpServletRequest request) { public JSONObject updateData(Long consultId, String status, String description ,HttpServletRequest request) {
JSONObject rtnJson = new JSONObject(); JSONObject rtnJson = new JSONObject();
ConsultSheet consultSheet = consultSheetService.fetchById(Long.parseLong(consultId)); ConsultSheet consultSheet = consultSheetService.fetchById(consultId);
consultSheet.setDescription(description); consultSheet.setDescription(description);
try { try {
if (StringUtils.isNoneBlank(consultId) && StringUtils.isNoneBlank(status) && StringUtils.isNoneBlank(description)) { if (consultId != null && StringUtils.isNoneBlank(status) && StringUtils.isNoneBlank(description)) {
Integer integer = consultSheetService.updateDate(consultId, status, description); Integer integer = consultSheetService.updateDate(consultId, status, description);
if (integer>0) { if (integer>0) {
//发送审核通过模板消息 //发送审核通过模板消息
...@@ -327,12 +327,12 @@ public class ConsultSheetController { ...@@ -327,12 +327,12 @@ public class ConsultSheetController {
@RequiresPermissions(value = CONSULTSHEET_EDIT) @RequiresPermissions(value = CONSULTSHEET_EDIT)
@RequestMapping("/updateStatus") @RequestMapping("/updateStatus")
@ResponseBody @ResponseBody
public JSONObject updateStatus(String consultId, String status, Long pastRecords, Long allergy, HttpServletRequest request) { public JSONObject updateStatus(Long consultId, String status, Long pastRecords, Long allergy, HttpServletRequest request) {
Long accountId = UserUtils.getmpaccounts(request); Long accountId = UserUtils.getmpaccounts(request);
JSONObject rtnJson = new JSONObject(); JSONObject rtnJson = new JSONObject();
ConsultSheet consultSheet = consultSheetService.fetchById(Long.parseLong(consultId)); ConsultSheet consultSheet = consultSheetService.fetchById(consultId);
try { try {
if (StringUtils.isNoneBlank(consultId) && StringUtils.isNoneBlank(status)) { if (consultId != null && StringUtils.isNoneBlank(status)) {
Integer integer = consultSheetService.updateStatus(consultId, status); Integer integer = consultSheetService.updateStatus(consultId, status);
if (integer > 0){ if (integer > 0){
......
aidea-modules/consult-module/target/classes/com/cftech/consultsheet/dao/ConsultSheetMapper.xml
View file @ 62f375f0
...@@ -108,7 +108,10 @@ ...@@ -108,7 +108,10 @@
allergy, allergy,
symptom, symptom,
open_id, open_id,
consult_id consultId consult_id consultId,
status,
drugs_id drugsId,
address_id addressId
</sql> </sql>
<insert id="save" parameterType="com.cftech.consultsheet.model.ConsultSheet" useGeneratedKeys="true" <insert id="save" parameterType="com.cftech.consultsheet.model.ConsultSheet" useGeneratedKeys="true"
...@@ -177,14 +180,14 @@ ...@@ -177,14 +180,14 @@
) )
</insert> </insert>
<select id="fetchById" parameterType="java.lang.Long" resultMap="com.cftech.consultsheet.model.ConsultSheet"> <select id="fetchById" parameterType="java.lang.Long" resultType="com.cftech.consultsheet.model.ConsultSheet">
SELECT 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 FROM t_aidea_consult_sheet a
LEFT JOIN t_qyuser b ON b.id = a.doctor_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 t_qyuser c ON c.id = a.service_id
LEFT JOIN t_qyuser d ON d.id = a.past_records LEFT JOIN t_qyuser d ON d.id = a.past_records
LEFT JOIN t_qyuser e ON e.id = a.allergy LEFT JOIN t_orgunit e ON e.id = a.allergy
WHERE a.id = #{id} WHERE a.id = #{id}
</select> </select>
......
aidea-modules/order-module-web/src/main/webapp/WEB-INF/views/order/orderlist.html
View file @ 62f375f0
...@@ -388,7 +388,11 @@ ...@@ -388,7 +388,11 @@
"aTargets": [6], "aTargets": [6],
"mData": "nickName", "mData": "nickName",
"mRender": function (a, b, c, d) { "mRender": function (a, b, c, d) {
return a; if (a) {
return a.slice(0, 1) + '*' + a.slice(2, 3);
} else {
return null;
}
} }
} }
, ,
...@@ -476,7 +480,7 @@ ...@@ -476,7 +480,7 @@
html += '<li><a href="#springUrl("/a/order/form?id=' + a + '")">添加商品</a></li>'; html += '<li><a href="#springUrl("/a/order/form?id=' + a + '")">添加商品</a></li>';
} }
if (c.status == '1') { if (c.status == '1') {
html += '<li><a onclick="updateStatusSuccess(' + a + ')">订单付款</a></li>'; html += '<li><a onclick="updateStatusSuccess(' + a + ',' + c.openid + ')">订单付款</a></li>';
} }
if (c.status != '4' && c.status != '5') { if (c.status != '4' && c.status != '5') {
html += '<li><a onclick="updateStatus(' + a + ')">订单关闭</a></li>'; html += '<li><a onclick="updateStatus(' + a + ')">订单关闭</a></li>';
...@@ -518,7 +522,7 @@ ...@@ -518,7 +522,7 @@
btntext: "确定", btntext: "确定",
btncanceltext: "取消", btncanceltext: "取消",
success: function () { success: function () {
updateStatu(id, 5); updateStatu(id, null, 5);
}, },
cancel: function () { cancel: function () {
...@@ -527,13 +531,13 @@ ...@@ -527,13 +531,13 @@
}); });
} }
function updateStatusSuccess(id) { function updateStatusSuccess(id, openid) {
Cfapp.confirm({ Cfapp.confirm({
message: "是否确认付款", message: "是否确认付款",
btntext: "确定", btntext: "确定",
btncanceltext: "取消", btncanceltext: "取消",
success: function () { success: function () {
updateStatu(id, 3);//付款待发货 updateStatu(id, openid, 3);//付款待发货
}, },
cancel: function () { cancel: function () {
location.href = "#springUrl('/a/order/list')"; location.href = "#springUrl('/a/order/list')";
...@@ -541,13 +545,14 @@ ...@@ -541,13 +545,14 @@
}); });
} }
function updateStatu(id, status) { function updateStatu(id, openid, status) {
var url = "#springUrl('/a/order/updateStatus')" var url = "#springUrl('/a/order/updateStatus')"
$.ajax({ $.ajax({
url: url, url: url,
type: "GET", type: "GET",
data: {id: id, data: {id: id,
status: status}, openid: openid,
status: status},
success: function (rsp) { success: function (rsp) {
console.log(rsp); console.log(rsp);
if (rsp.errorNo == "0") { if (rsp.errorNo == "0") {
......
aidea-modules/order-module/src/main/java/com/cftech/order/web/OrderController.java
View file @ 62f375f0
...@@ -266,7 +266,6 @@ public class OrderController { ...@@ -266,7 +266,6 @@ public class OrderController {
} catch (IOException e) { } catch (IOException e) {
log.error(e.getMessage()); log.error(e.getMessage());
} }
return list(request, model); return list(request, model);
} }
...@@ -275,18 +274,20 @@ public class OrderController { ...@@ -275,18 +274,20 @@ public class OrderController {
model.addAttribute("isDetail",'y'); model.addAttribute("isDetail",'y');
return orderDetailsController.list(request,model,id); return orderDetailsController.list(request,model,id);
} }
@RequestMapping("/deleteAll") @RequestMapping("/deleteAll")
@ResponseBody @ResponseBody
public JSONObject deleteAll(Long id) { public JSONObject deleteAll(Long id) {
return orderService.deleteAll(id); return orderService.deleteAll(id);
} }
@RequestMapping("/updateStatus") @RequestMapping("/updateStatus")
@ResponseBody @ResponseBody
public JSONObject updateStatus(Long id, String status, HttpServletRequest request) { public JSONObject updateStatus(Long id, String openid, String status, HttpServletRequest request) {
JSONObject rtnJson = new JSONObject(); JSONObject rtnJson = new JSONObject();
Integer integer = orderService.updateStatus(id, status); Integer integer = orderService.updateStatus(id, status);
if (integer>0){ //设置已付款
if (integer > 0){
rtnJson.put("errorNo","0"); rtnJson.put("errorNo","0");
return rtnJson; return rtnJson;
} }
......
aidea-modules/product-classify-module-web/src/main/webapp/WEB-INF/views/productclassify/productclassifylist.html
View file @ 62f375f0
...@@ -206,26 +206,26 @@ ...@@ -206,26 +206,26 @@
"mData": "id" "mData": "id"
}, },
{ {
"mData":"classifyName" "mData": "classifyName"
}, },
{ {
"mData":"classifyNumber" "mData": "classifyNumber"
}, },
{ {
"mData":"sort" "mData": "sort"
}, },
{ {
"mData":"parentId" "mData": "parentId"
} }
, ,
{ {
"mData":"parentName" "mData": "parentName"
}, },
{ {
"mData":"whetherRecommend" "mData": "whetherRecommend"
}, },
{ {
"mData":"description" "mData": "description"
}, },
{ {
"mData": "createTime" "mData": "createTime"
...@@ -239,43 +239,35 @@ ...@@ -239,43 +239,35 @@
'targets': [0] 'targets': [0]
}, },
{ {
"aTargets":[4], "aTargets": [4],
"mData":"parentId", "mData": "parentId",
"mRender":function(a, b, c, d){ "mRender": function (a, b, c, d) {
if (a==0){ if (a == 0) {
return "一级"; return "一级";
} }
return "二级"; return "二级";
} }
}, },
{ {
"aTargets":[5], "aTargets": [5],
"mData":"parentName", "mData": "parentName",
"mRender":function(a, b, c, d){ "mRender": function (a, b, c, d) {
if (a==0 || a==null){ if (a == 0 || a == null) {
return ""; return "";
} }
return a; return a;
} }
}, },
{ {
"aTargets":[6], "aTargets": [8],
"mData":"classifyImg",
"mRender":function(a, b, c, d){
return "<img src='"+a+"' style='width: 80px;height: 80px;'>";
}
},
{
"aTargets": [9],
"mData": "createTime", "mData": "createTime",
"mRender": function (a, b, c, d) { "mRender": function (a, b, c, d) {
return formatDates(a, "yyyy-MM-dd HH:mm:ss"); return formatDates(a, "yyyy-MM-dd HH:mm:ss");
} }
}, },
{ {
"aTargets": [10], "aTargets": [9],
"mData": "id", "mData": "id",
"mRender": function (a, b, c, d) {//a表示id对应的值，c表示当前记录行对象 "mRender": function (a, b, c, d) {//a表示id对应的值，c表示当前记录行对象
var html = '#if($shiro.hasPermission("qy:productclassify:edit"))';// var html = '#if($shiro.hasPermission("qy:productclassify:edit"))';//
...@@ -318,7 +310,7 @@ ...@@ -318,7 +310,7 @@
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: "#springUrl('/a/productclassify/delete')", url: "#springUrl('/a/productclassify/delete')",
data: {id: data, _csrfheader: csrfheader.value, _csrf: csrftoken.value }, data: {id: data, _csrfheader: csrfheader.value, _csrf: csrftoken.value},
dataType: "json", dataType: "json",
success: function (data) { success: function (data) {
if (data.errorNo == 0) { if (data.errorNo == 0) {
......
aidea-modules/product-classify-module/src/main/java/com/cftech/productclassify/model/Productclassify.java
View file @ 62f375f0
...@@ -8,30 +8,30 @@ import java.io.Serializable; ...@@ -8,30 +8,30 @@ import java.io.Serializable;
import java.util.Date; import java.util.Date;
/** /**
* 产品分类 * 产品分类
* *
* @author Buyj * @author Buyj
* @date: 2020-09-22 18:06 * @date: 2020-09-22 18:06
*/ */
@Data @Data
public class Productclassify implements Serializable { public class Productclassify implements Serializable {
/* 主键id */ /* 主键id */
private Long id; private Long id;
/* 分类名称 */ /* 分类名称 */
@ExportConfig(value = "分类名称", width = 100, showLevel = 2) @ExportConfig(value = "分类名称", width = 100, showLevel = 2)
private String classifyName; private String classifyName;
/* 分类编码 */ /* 分类编码 */
@ExportConfig(value = "分类编码", width = 100, showLevel = 2) @ExportConfig(value = "分类编码", width = 100, showLevel = 2)
private String classifyNumber; private String classifyNumber;
/* 分类banner图 */ /* 分类banner图 */
@ExportConfig(value = "分类banner图", width = 100, showLevel = 1) @ExportConfig(value = "分类banner图", width = 100, showLevel = 1)
private String classifyImg; private String classifyImg;
/* 序号 */ /* 序号 */
@ExportConfig(value = "序号", width = 100, showLevel = 2) @ExportConfig(value = "序号", width = 100, showLevel = 2)
private String sort; private String sort;
/* 是否推荐 */ /* 是否推荐 */
@ExportConfig(value = "是否推荐(是/否)", width = 200, showLevel = 2) @ExportConfig(value = "是否推荐(是/否)", width = 200, showLevel = 2)
private String whetherRecommend; private String whetherRecommend;
/** /**
* 父级ID * 父级ID
...@@ -46,26 +46,26 @@ public class Productclassify implements Serializable { ...@@ -46,26 +46,26 @@ public class Productclassify implements Serializable {
* 父级编码 * 父级编码
*/ */
private String parentNumber; private String parentNumber;
/* 所属的账号 */ /* 所属的账号 */
private Long accountsId; private Long accountsId;
/* 删除标识 */ /* 删除标识 */
private boolean delFlag; private boolean delFlag;
/* 状态 */ /* 状态 */
private String status; private String status;
/* 创建时间 */ /* 创建时间 */
private Date createTime; private Date createTime;
/* 更新时间 */ /* 更新时间 */
private Date updateTime; private Date updateTime;
/* 备注 */ /* 备注 */
private String description; private String description;
/* 创建人 */ /* 创建人 */
private Long createBy; private Long createBy;
/* 更新人 */ /* 更新人 */
private Long updateBy; private Long updateBy;
public Productclassify() { public Productclassify() {
this.delFlag = false; this.delFlag = false;
this.status = "0"; this.status = "0";
} }
} }
\ No newline at end of file
aidea-modules/product-classify-module/src/main/java/com/cftech/productclassify/service/impl/ProductclassifyServiceImpl.java
View file @ 62f375f0
...@@ -113,7 +113,7 @@ public class ProductclassifyServiceImpl extends GenericServiceImpl<Productclassi ...@@ -113,7 +113,7 @@ public class ProductclassifyServiceImpl extends GenericServiceImpl<Productclassi
MpAccountsEntity mpAccountsAppid = mpAccountsService.getMpAccountsAppid(appId); MpAccountsEntity mpAccountsAppid = mpAccountsService.getMpAccountsAppid(appId);
List<ProductVO> hotproduct = productclassifyMapper.hotproduct(); List<ProductVO> hotproduct = productclassifyMapper.hotproduct();
if (hotproduct==null){ if (hotproduct==null){
rtnJson.put("errorNO","1"); rtnJson.put("errorNo","1");
rtnJson.put("errorMsg","查询失败"); rtnJson.put("errorMsg","查询失败");
return rtnJson; return rtnJson;
} }
...@@ -122,7 +122,7 @@ public class ProductclassifyServiceImpl extends GenericServiceImpl<Productclassi ...@@ -122,7 +122,7 @@ public class ProductclassifyServiceImpl extends GenericServiceImpl<Productclassi
rtnJson.put("data",hotproduct); rtnJson.put("data",hotproduct);
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
rtnJson.put("errorNO","1"); rtnJson.put("errorNo","1");
} }
return rtnJson; return rtnJson;
...@@ -135,7 +135,7 @@ public class ProductclassifyServiceImpl extends GenericServiceImpl<Productclassi ...@@ -135,7 +135,7 @@ public class ProductclassifyServiceImpl extends GenericServiceImpl<Productclassi
MpAccountsEntity mpAccountsAppid = mpAccountsService.getMpAccountsAppid(appId); MpAccountsEntity mpAccountsAppid = mpAccountsService.getMpAccountsAppid(appId);
List<ProductVO> medicine = productclassifyMapper.medicine(); List<ProductVO> medicine = productclassifyMapper.medicine();
if (medicine==null){ if (medicine==null){
rtnJson.put("errorNO","1"); rtnJson.put("errorNo","1");
rtnJson.put("errorMsg","查询失败"); rtnJson.put("errorMsg","查询失败");
return rtnJson; return rtnJson;
} }
...@@ -144,7 +144,7 @@ public class ProductclassifyServiceImpl extends GenericServiceImpl<Productclassi ...@@ -144,7 +144,7 @@ public class ProductclassifyServiceImpl extends GenericServiceImpl<Productclassi
rtnJson.put("data",medicine); rtnJson.put("data",medicine);
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
rtnJson.put("errorNO","1"); rtnJson.put("errorNo","1");
} }
return rtnJson; return rtnJson;
...@@ -163,7 +163,7 @@ public class ProductclassifyServiceImpl extends GenericServiceImpl<Productclassi ...@@ -163,7 +163,7 @@ public class ProductclassifyServiceImpl extends GenericServiceImpl<Productclassi
MpAccountsEntity mpAccountsAppid = mpAccountsService.getMpAccountsAppid(appId); MpAccountsEntity mpAccountsAppid = mpAccountsService.getMpAccountsAppid(appId);
List<ProductVO> productVOS = productclassifyMapper.productDosage(); List<ProductVO> productVOS = productclassifyMapper.productDosage();
if (productVOS==null){ if (productVOS==null){
rtnJson.put("errorNO","1"); rtnJson.put("errorNo","1");
rtnJson.put("errorMsg","查询失败"); rtnJson.put("errorMsg","查询失败");
return rtnJson; return rtnJson;
} }
...@@ -172,7 +172,7 @@ public class ProductclassifyServiceImpl extends GenericServiceImpl<Productclassi ...@@ -172,7 +172,7 @@ public class ProductclassifyServiceImpl extends GenericServiceImpl<Productclassi
rtnJson.put("data",productVOS); rtnJson.put("data",productVOS);
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
rtnJson.put("errorNO","1"); rtnJson.put("errorNo","1");
} }
return rtnJson; return rtnJson;
......
aidea-modules/product-module/src/main/java/com/cftech/product/service/impl/ProductServiceImpl.java
View file @ 62f375f0
...@@ -174,17 +174,17 @@ public class ProductServiceImpl extends GenericServiceImpl<Product> implements P ...@@ -174,17 +174,17 @@ public class ProductServiceImpl extends GenericServiceImpl<Product> implements P
try { try {
List<ProductVO> product = productMapper.product(id); List<ProductVO> product = productMapper.product(id);
if (product==null){ if (product==null){
rtnJson.put("errorNO","1"); rtnJson.put("errorNo","1");
rtnJson.put("errorMsg","查询失败"); rtnJson.put("errorMsg","查询失败");
return rtnJson; return rtnJson;
} }
MpAccountsEntity mpAccountsAppid = mpAccountsService.getMpAccountsAppid(appId); MpAccountsEntity mpAccountsAppid = mpAccountsService.getMpAccountsAppid(appId);
Log.info("返回结果:"+product); Log.info("返回结果:"+product);
rtnJson.put("errorNO","0"); rtnJson.put("errorNo","0");
rtnJson.put("data",product); rtnJson.put("data",product);
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
rtnJson.put("errorNO","1"); rtnJson.put("errorNo","1");
} }
return rtnJson; return rtnJson;
} }
......
cftech-common-web/src/main/resources/idcard.txt
View file @ 62f375f0
432503199206040032,432503199203056646
\ No newline at end of file
membercard-modules/member-module/src/main/java/com/cftech/member/model/MemberVO.java
View file @ 62f375f0
package com.cftech.member.model; package com.cftech.member.model;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
...@@ -44,6 +43,8 @@ public class MemberVO { ...@@ -44,6 +43,8 @@ public class MemberVO {
* 会员编码 * 会员编码
*/ */
private String number; private String number;
/**
* 是否三期患者
*/
private String compan; private String compan;
} }
membercard-modules/shipping-address-module/src/main/java/com/cftech/addresst/service/impl/AddressServiceImpl.java
View file @ 62f375f0
...@@ -128,7 +128,7 @@ public class AddressServiceImpl extends GenericServiceImpl<Address> implements A ...@@ -128,7 +128,7 @@ public class AddressServiceImpl extends GenericServiceImpl<Address> implements A
} }
MpAccountsEntity mpAccountsAppid = mpAccountsService.getMpAccountsAppid(address.getAppId()); MpAccountsEntity mpAccountsAppid = mpAccountsService.getMpAccountsAppid(address.getAppId());
newAddress.setOpenId(address.getOpenId()); newAddress.setOpenId(address.getOpenId());
newAddress.setAccountsId(address.getAccountsId()); newAddress.setAccountsId(mpAccountsAppid.getId());
newAddress.setAddressName(address.getAddressName()); newAddress.setAddressName(address.getAddressName());
newAddress.setPhone(address.getPhone()); newAddress.setPhone(address.getPhone());
newAddress.setAddress(address.getAddress()); newAddress.setAddress(address.getAddress());
......
membercard-modules/shipping-address-module/src/main/java/com/cftech/addresst/web/MobileAddressController.java
View file @ 62f375f0
...@@ -70,7 +70,7 @@ public class MobileAddressController { ...@@ -70,7 +70,7 @@ public class MobileAddressController {
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
rtnJson.put("errorNO", "1"); rtnJson.put("errorNo", "1");
} }
return rtnJson; return rtnJson;
......
qy-modules/qy-orgunit-module-web/src/main/webapp/WEB-INF/views/managerqyuser/qyuseradd.html
View file @ 62f375f0
...@@ -54,7 +54,18 @@ ...@@ -54,7 +54,18 @@
<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script> <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]--> <![endif]-->
<link rel="stylesheet" href="common/css/uePicPicker.css">
</head> </head>
<style>
.previewImg {
border: 0px;
display: none;
z-index: 999;
max-height: 100%;
max-width: 100%
}
</style>
<!-- END HEAD --> <!-- END HEAD -->
<body class="hold-transition skin-blue sidebar-mini"> <body class="hold-transition skin-blue sidebar-mini">
...@@ -192,6 +203,9 @@ ...@@ -192,6 +203,9 @@
<input type="checkbox" name="sex"/> <input type="checkbox" name="sex"/>
</div> </div>
</div> </div>
<div class="form-group form-md-line-input col-md-12" id="img">
</div>
<!-- <div class="form-group form-md-line-input col-md-4"> <!-- <div class="form-group form-md-line-input col-md-4">
<label>是否可核销</label> <label>是否可核销</label>
<div class="switch"> <div class="switch">
...@@ -262,12 +276,16 @@ ...@@ -262,12 +276,16 @@
<script src="plugins/bootstrap-switch/bootstrap-switch.min.js"></script> <script src="plugins/bootstrap-switch/bootstrap-switch.min.js"></script>
<script src="common/js/cfapp.js"></script> <script src="common/js/cfapp.js"></script>
<script src="plugins/security/sha256.js" type="text/javascript"></script> <script src="plugins/security/sha256.js" type="text/javascript"></script>
<script src="js/jquery.serializejson.js"></script>
<script src="plugins/jquery-validation/js/localization/messages_zh.js"></script>
<script src="plugins/Sortable/Sortable.min.js"></script>
<script src="common/component/uePicPicker.js"></script>
<!-- END PAGE LEVEL PLUGINS --> <!-- END PAGE LEVEL PLUGINS -->
<script> <script>
$().ready(function () { $().ready(function () {
Cfapp.init(); Cfapp.init();
formAdd.init(); formAdd.init();
initPicsSel();
if ($("#loginNameQyUser").val() == null || $("#loginNameQyUser").val() == "") { if ($("#loginNameQyUser").val() == null || $("#loginNameQyUser").val() == "") {
$("#loginNameQyUser").val(""); $("#loginNameQyUser").val("");
} }
...@@ -276,6 +294,48 @@ ...@@ -276,6 +294,48 @@
} }
}); });
var coverPP = null;
var initPicsSel = function () {
var smallimg = "$!{data.img}";
coverPP = new uePicPicker({
tarId: 'img',
title: '栏目小图',
sizeDes: '205*202',
max: 1,
datas: smallimg=='' ? null : smallimg.split(","),
success: null
});
coverPP.init();
};
var img = $("#img").val();
var protocol = window.location.protocol;
var host = window.location.host;
if (img && img != null) {
if (img.substring(0, 7) == "http://") {
$("#previewImg").attr("src", img).show();
} else {
$("#previewImg").attr("src", protocol + '//' + host + img).show();
}
$("#previewImg").siblings("i").remove();
}
/**
* 小图选择
*/
$("#ImgSelect").click(function () {
obj = $(this);
Cfapp.sm({
title: "栏目图选择",
success: function (data) {
obj.find("i").remove();
$("#img").val(data[0]);
$("#previewImg").attr("src", data[0]).show();
}
})
});
var formAdd = function () { var formAdd = function () {
...@@ -344,6 +404,8 @@ ...@@ -344,6 +404,8 @@
}); });
$(".select2").select2(); $(".select2").select2();
$('#orgSelect').on('click', $('#orgSelect').on('click',
function () { function () {
...@@ -496,11 +558,15 @@ ...@@ -496,11 +558,15 @@
$('#isVer').val('1'); $('#isVer').val('1');
} }
var dataJson = $("#myForm").serializeJSON();
var cover = coverPP.getStringValues();
dataJson.img = cover.substring(0, cover.lastIndexOf(','));
if ($("#passwordQyUser").val() != null && $("#passwordQyUser").val() != "") { if ($("#passwordQyUser").val() != null && $("#passwordQyUser").val() != "") {
var password = sha256_digest($("#passwordQyUser").val()); var password = sha256_digest($("#passwordQyUser").val());
$("#passwordQyUser").val(password); $("#passwordQyUser").val(password);
} }
$.post("#springUrl('/a/qyuser/formData')", $("#myForm").serialize(), function (returnobj) { $.post("#springUrl('/a/qyuser/formData')", dataJson, function (returnobj) {
$("#save").attr("disabled", false); $("#save").attr("disabled", false);
if (returnobj.errorNo == 2) { //保存成功 if (returnobj.errorNo == 2) { //保存成功
Cfapp.confirm({ Cfapp.confirm({
......
qy-modules/qy-orgunit-module/src/main/java/com/cftech/base/org/model/Qyuser.java
View file @ 62f375f0
...@@ -151,6 +151,9 @@ public class Qyuser implements Serializable { ...@@ -151,6 +151,9 @@ public class Qyuser implements Serializable {
private Long unAssigned; private Long unAssigned;
private String img;
public Qyuser() { public Qyuser() {
this.delFlag = false; this.delFlag = false;
this.peakVal = 0L; this.peakVal = 0L;
......
qy-modules/qy-orgunit-module/src/main/java/com/cftech/base/org/web/QyuserController.java
View file @ 62f375f0
...@@ -99,10 +99,6 @@ public class QyuserController { ...@@ -99,10 +99,6 @@ public class QyuserController {
Position position = positionService.fetchById(qyuser.getPositionId()); Position position = positionService.fetchById(qyuser.getPositionId());
model.addAttribute("positionName", position.getName()); model.addAttribute("positionName", position.getName());
} }
// if (!StringUtils.isEmpty(qyuser.getStoreId())) {
// Store store = storeService.fetchById(qyuser.getStoreId());
// model.addAttribute("storeName", store.getName());
// }
model.addAttribute("data", qyuser); model.addAttribute("data", qyuser);
model.addAttribute("accountId", qyuser.getAccountsId()); model.addAttribute("accountId", qyuser.getAccountsId());
...@@ -127,7 +123,6 @@ public class QyuserController { ...@@ -127,7 +123,6 @@ public class QyuserController {
try { try {
if (qyuser != null && qyuser.getId() != null) { if (qyuser != null && qyuser.getId() != null) {
Conds conds = new Conds(); Conds conds = new Conds();
conds.equal("t.username", loginNameQyUser); conds.equal("t.username", loginNameQyUser);
conds.equal("t.delflag", 0); conds.equal("t.delflag", 0);
...@@ -141,9 +136,11 @@ public class QyuserController { ...@@ -141,9 +136,11 @@ public class QyuserController {
} }
qyuser.setUpdateBy(userId); qyuser.setUpdateBy(userId);
qyuser.setWxuserId(loginNameQyUser); qyuser.setWxuserId(loginNameQyUser);
//update
// 2017-10-27 取消同步微信企业号标签操作
qyUserUtil.updateQyUser(qyuser); qyUserUtil.updateQyUser(qyuser);
if (!StringUtils.isEmpty(qyuser.getImg())) {
String domainName = SystemConfig.p.getProperty("QY_DOMAIN");
qyuser.setDescription(domainName + qyuser.getImg());
}
qyuserService.update(qyuser); qyuserService.update(qyuser);
if (!StringUtils.isEmpty(loginNameQyUser)) { if (!StringUtils.isEmpty(loginNameQyUser)) {
user.setUsername(loginNameQyUser); user.setUsername(loginNameQyUser);
...@@ -152,8 +149,6 @@ public class QyuserController { ...@@ -152,8 +149,6 @@ public class QyuserController {
user.setPassword(passwordQyUser); user.setPassword(passwordQyUser);
} }
userService.update(user); userService.update(user);
// 2017-10-27 取消同步微信企业号标签操作
// qyTagUtil.syncTag(qyuser);
rtnJson.put("errorNo", 0); rtnJson.put("errorNo", 0);
} else { } else {
Conds conds = new Conds(); Conds conds = new Conds();
...@@ -179,16 +174,16 @@ public class QyuserController { ...@@ -179,16 +174,16 @@ public class QyuserController {
user.setPassword(passwordQyUser); user.setPassword(passwordQyUser);
user.setUsername(loginNameQyUser); user.setUsername(loginNameQyUser);
user.setState("0"); user.setState("0");
if (!StringUtils.isEmpty(qyuser.getImg())) {
String domainName = SystemConfig.p.getProperty("QY_DOMAIN");
qyuser.setDescription(domainName + qyuser.getImg());
}
qyuserService.save(qyuser); qyuserService.save(qyuser);
user.setUserid(qyuser.getId()); user.setUserid(qyuser.getId());
user.setDefaultAccId(UserUtils.getmpaccounts(request)); user.setDefaultAccId(UserUtils.getmpaccounts(request));
userService.save(user); userService.save(user);
//2017-10-27 取消同步微信企业号标签操作 qyTagUtil.syncTag(qyuser);
rtnJson.put("errorNo", 2); rtnJson.put("errorNo", 2);
} }
//取消终端
// String[] terminalStrs = terminalIds.split(",");
// terminalUserService.saveBatchTerminalCommodity(qyuser.getId(), terminalStrs,qyuser.getWxuserId());
} catch (Exception e) { } catch (Exception e) {
rtnJson.put("errorNo", 1); rtnJson.put("errorNo", 1);
} }
......
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