Skip to content

A
Aidea
Commit 36a9bb9d authored by 谢希宇's avatar 谢希宇
Browse files
Options

Submit by Strive 

Date 2021/03/22
parent c82fee50
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2452 additions and 294 deletions
aidea-modules/checkresult-module/src/main/java/com/cftech/checkresult/dao/CheckresultMapper.xml
View file @ 36a9bb9d
...@@ -173,7 +173,8 @@ ...@@ -173,7 +173,8 @@
<select id="fetchSearchByPage" parameterType="java.util.Map" resultMap="resultMap"> <select id="fetchSearchByPage" parameterType="java.util.Map" resultMap="resultMap">
SELECT SELECT
<include refid="sqlColumns"/>, <include refid="sqlColumns"/>,
CONVERT(AES_DECRYPT(f.nickname,'aideakey') USING UTF8) name, o.org_name orgName, f.nickname name,
o.org_name orgName,
cr.verif_date verifDate cr.verif_date verifDate
FROM t_aidea_check_result t FROM t_aidea_check_result t
LEFT JOIN wx_mp_fanss f ON t.openid = f.openid AND f.delflag = '0' LEFT JOIN wx_mp_fanss f ON t.openid = f.openid AND f.delflag = '0'
......
aidea-modules/checkresult-module/src/main/java/com/cftech/checkresult/service/impl/CheckresultServiceImpl.java
View file @ 36a9bb9d
...@@ -133,10 +133,10 @@ public class CheckresultServiceImpl extends GenericServiceImpl<Checkresult> impl ...@@ -133,10 +133,10 @@ public class CheckresultServiceImpl extends GenericServiceImpl<Checkresult> impl
String token = mpTokenUtil.getToken(mpAccountsService.getMpAccountsAppid(appid)); String token = mpTokenUtil.getToken(mpAccountsService.getMpAccountsAppid(appid));
String refuseTmpId = SystemConfig.p.getProperty("CHECK_RESULT_TEMPLATE_MSG"); String refuseTmpId = SystemConfig.p.getProperty("CHECK_RESULT_TEMPLATE_MSG");
String first = "您好，您的检测已出结果。"; String first = "您好，您的检测已出结果。";
String remark = "点击“详情”查看详细报告"; String remark = "点击详情查询您的检测报告。";
String[] keywords = { checkresult.getCheckProject(),//检测项目 String[] keywords = { checkresult.getName(),
checkresult.getCheckMethod(),//检测类型 checkresult.getCheckProject(),//检测项目
DateFormatUtils.getDateFormat(checkresult.getVerifDate(), "yyyy年MM月dd日"),//检测券核销时间 DateFormatUtils.getDateFormat(checkresult.getVerifDate(), "yyyy年MM月dd日"),//检测券核销时间
remark};//检测结果 remark};//检测结果
String url = SystemConfig.p.getProperty("MOBILE_MP_DOMAIN_NAME") + "/bzgldetails?appid="+appid+"&tokenId=1&id="+checkresult.getId(); String url = SystemConfig.p.getProperty("MOBILE_MP_DOMAIN_NAME") + "/bzgldetails?appid="+appid+"&tokenId=1&id="+checkresult.getId();
......
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/dao/ConsultSheetMapper.xml
View file @ 36a9bb9d
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
<select id="fetchById" parameterType="java.lang.Long" resultType="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, f.store fansAlias, CONVERT(AES_DECRYPT(f.nickname,'aideakey') USING UTF8) nickName <include refid="sqlColumns"/>, d.name pharmacist, e.org_name hospital, f.store fansAlias, f.nickname nickName
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
......
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/service/impl/ConsultSheetServiceImpl.java
View file @ 36a9bb9d
...@@ -345,15 +345,17 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im ...@@ -345,15 +345,17 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
if (StringUtils.isNoneBlank(consultSheet.getOpenId())) { if (StringUtils.isNoneBlank(consultSheet.getOpenId())) {
MpFanssEntity mpFanssEntity = mpFanssService.getWxUser(consultSheet.getOpenId()); MpFanssEntity mpFanssEntity = mpFanssService.getWxUser(consultSheet.getOpenId());
if (mpFanssEntity != null) { if (mpFanssEntity != null) {
nickname = mpFanssEntity.getNickname(); nickname = StringUtils.isBlank(mpFanssEntity.getNickname()) ? "":mpFanssEntity.getNickname();
fansAlias = mpFanssEntity.getStore(); fansAlias = StringUtils.isBlank(mpFanssEntity.getStore()) ? "":mpFanssEntity.getStore();
} }
} }
//推送客服消息 //推送客服消息
String msg = null; String msg = null;
Qyuser service = qyuserService.fetchById(consultSheet.getServiceId()); Qyuser service = qyuserService.fetchById(consultSheet.getServiceId());
msg = SystemConfig.p.getProperty("QY_SEND_CUSTOMERSERVICE_MSG").replace("{NUMBER}", consultSheet.getConsultId()).replace("{NICKNAME}", StringUtils.isBlank(nickname) ? "":nickname).replace("{FANSALIAS}", fansAlias); msg = SystemConfig.p.getProperty("QY_SEND_CUSTOMERSERVICE_MSG").replace("{NUMBER}", consultSheet.getConsultId())//
.replace("{NICKNAME}", nickname)//
.replace("{FANSALIAS}", fansAlias);
List<Qyuser> serviceUsers = new ArrayList(); List<Qyuser> serviceUsers = new ArrayList();
serviceUsers.add(service); serviceUsers.add(service);
JSONObject result = qyMsgUtil.sendText(accounts, false, serviceUsers, null, null, JSONObject result = qyMsgUtil.sendText(accounts, false, serviceUsers, null, null,
...@@ -361,7 +363,9 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im ...@@ -361,7 +363,9 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
log.info("客服，消息发送日志 {}", result.toString()); log.info("客服，消息发送日志 {}", result.toString());
Qyuser doctor = qyuserService.fetchById(consultSheet.getDoctorId()); Qyuser doctor = qyuserService.fetchById(consultSheet.getDoctorId());
msg = SystemConfig.p.getProperty("QY_SEND_DOCTOR_MSG").replace("{NUMBER}", consultSheet.getConsultId()).replace("{NICKNAME}", StringUtils.isBlank(nickname) ? "":nickname).replace("{FANSALIAS}", fansAlias); msg = SystemConfig.p.getProperty("QY_SEND_DOCTOR_MSG").replace("{NUMBER}", consultSheet.getConsultId())//
.replace("{NICKNAME}", nickname)//
.replace("{FANSALIAS}", fansAlias);
List<Qyuser> doctorUsers = new ArrayList(); List<Qyuser> doctorUsers = new ArrayList();
doctorUsers.add(doctor); doctorUsers.add(doctor);
qyMsgUtil.sendText(accounts, false, doctorUsers, null, null, qyMsgUtil.sendText(accounts, false, doctorUsers, null, null,
......
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/web/ConsultSheetController.java
View file @ 36a9bb9d
...@@ -619,12 +619,12 @@ public class ConsultSheetController { ...@@ -619,12 +619,12 @@ public class ConsultSheetController {
//咨询单审核失败推送消息(客服) //咨询单审核失败推送消息(客服)
msg = SystemConfig.p.getProperty("QY_SEND_SERVICE_AUDIT_SUCCESS_MAG") + consultSheet.getConsultId() + "；患者昵称：" + msg = SystemConfig.p.getProperty("QY_SEND_SERVICE_AUDIT_SUCCESS_MAG") + consultSheet.getConsultId() + "；患者昵称：" +
(StringUtils.isNoneBlank(consultSheet.getNickName()) ? consultSheet.getNickName() : "") + "；患者别名：" + (StringUtils.isNoneBlank(consultSheet.getNickName()) ? consultSheet.getNickName() : "") + "；患者别名：" +
consultSheet.getFansAlias() + "；患者openid："+consultSheet.getOpenId(); (StringUtils.isNoneBlank(consultSheet.getFansAlias()) ? consultSheet.getFansAlias() : "");
} else { } else {
//咨询单审核失败推送消息(客服) //咨询单审核失败推送消息(客服)
msg = SystemConfig.p.getProperty("QY_SEND_SERVICE_AUDIT_FAIL_MAG") + consultSheet.getConsultId() + "；患者昵称：" + msg = SystemConfig.p.getProperty("QY_SEND_SERVICE_AUDIT_FAIL_MAG") + consultSheet.getConsultId() + "；患者昵称：" +
(StringUtils.isNoneBlank(consultSheet.getNickName()) ? consultSheet.getNickName() : "") + "；患者别名：" + (StringUtils.isNoneBlank(consultSheet.getNickName()) ? consultSheet.getNickName() : "") + "；患者别名：" +
consultSheet.getFansAlias() + "；患者openid："+consultSheet.getOpenId(); (StringUtils.isNoneBlank(consultSheet.getFansAlias()) ? consultSheet.getFansAlias() : "");
} }
qyMsgUtil.sendText(accounts, false, qyusers, null, null, agenId, msg, false); qyMsgUtil.sendText(accounts, false, qyusers, null, null, agenId, msg, false);
......
aidea-modules/couponrecord-module/src/main/java/com/cftech/couponrecord/dao/CouponrecordMapper.xml
View file @ 36a9bb9d
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
<select id="fetchById" parameterType="java.lang.Long" resultMap="resultMap"> <select id="fetchById" parameterType="java.lang.Long" resultMap="resultMap">
SELECT SELECT
<include refid="sqlColumns"/>, c.name couponName, CONVERT(AES_DECRYPT(f.nickname,'aideakey') USING UTF8) nickName, h.name hospitalName <include refid="sqlColumns"/>, c.name couponName, f.nickname nickName, h.name hospitalName
FROM t_aidea_coupon_record t FROM t_aidea_coupon_record t
LEFT JOIN t_aidea_check_coupon c ON t.coupon_id = c.id LEFT JOIN t_aidea_check_coupon c ON t.coupon_id = c.id
LEFT JOIN wx_mp_fanss f ON f.openid = t.openid AND f.delflag = '0' LEFT JOIN wx_mp_fanss f ON f.openid = t.openid AND f.delflag = '0'
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
<select id="fetchSearchByPage" parameterType="java.util.Map" resultMap="resultMap"> <select id="fetchSearchByPage" parameterType="java.util.Map" resultMap="resultMap">
SELECT SELECT
<include refid="sqlColumns"/>, c.name couponName, CONVERT(AES_DECRYPT(f.nickname,'aideakey') USING UTF8) nickName <include refid="sqlColumns"/>, c.name couponName, f.nickname nickName
FROM t_aidea_coupon_record t FROM t_aidea_coupon_record t
LEFT JOIN t_aidea_check_coupon c ON t.coupon_id = c.id LEFT JOIN t_aidea_check_coupon c ON t.coupon_id = c.id
LEFT JOIN wx_mp_fanss f ON f.openid = t.openid AND f.delflag = '0' LEFT JOIN wx_mp_fanss f ON f.openid = t.openid AND f.delflag = '0'
...@@ -302,7 +302,7 @@ ...@@ -302,7 +302,7 @@
</select> </select>
<update id="updatePdaLog" parameterType="java.util.Map"> <update id="updatePdaLog" parameterType="java.util.Map">
update t_aidea_PdaLog update t_aidea_pdalog
set resultJson = #{resultJson, jdbcType=VARCHAR}, set resultJson = #{resultJson, jdbcType=VARCHAR},
status = #{status, jdbcType=BIGINT}, status = #{status, jdbcType=BIGINT},
update_time = now() update_time = now()
...@@ -311,7 +311,7 @@ ...@@ -311,7 +311,7 @@
<insert id="insertPdaLog" parameterType="java.util.Map" useGeneratedKeys="true" <insert id="insertPdaLog" parameterType="java.util.Map" useGeneratedKeys="true"
keyProperty="id"> keyProperty="id">
insert into t_aidea_PdaLog (id, content, create_time) insert into t_aidea_pdalog (id, content, create_time)
values (#{id, jdbcType=VARCHAR}, #{content, jdbcType=VARCHAR}, now()) values (#{id, jdbcType=VARCHAR}, #{content, jdbcType=VARCHAR}, now())
</insert> </insert>
......
aidea-modules/couponrecord-module/src/main/java/com/cftech/couponrecord/model/Couponrecord.java
View file @ 36a9bb9d
...@@ -39,19 +39,19 @@ public class Couponrecord implements Serializable { ...@@ -39,19 +39,19 @@ public class Couponrecord implements Serializable {
@ExportConfig(value = "二维码链接", width = 100, showLevel = 1) @ExportConfig(value = "二维码链接", width = 100, showLevel = 1)
private String qrcode; private String qrcode;
/* 失效时间 */ /* 失效时间 */
@ExportConfig(value = "失效时间", width = 100, showLevel = 1) @ExportConfig(value = "失效时间", width = 100, showLevel = 1, dateFormat = "yyyy-MM-dd")
private Date invalidDate; private Date invalidDate;
/* 核销时间 */ /* 核销时间 */
@ExportConfig(value = "核销时间", width = 100, showLevel = 1) @ExportConfig(value = "核销时间", width = 100, showLevel = 1, dateFormat = "yyyy-MM-dd")
private Date verifDate; private Date verifDate;
/* 设备号 */ /* 设备号 */
@ExportConfig(value = "设备号", width = 100, showLevel = 1) @ExportConfig(value = "设备号", width = 100, showLevel = 1)
private String facilityNo; private String facilityNo;
/* 过期时间 */ /* 过期时间 */
@ExportConfig(value = "过期时间", width = 100, showLevel = 1) @ExportConfig(value = "过期时间", width = 100, showLevel = 1, dateFormat = "yyyy-MM-dd")
private Date expireDate; private Date expireDate;
/* 过期时间 */ /* 过期时间 */
@ExportConfig(value = "生效时间", width = 100, showLevel = 1) @ExportConfig(value = "生效时间", width = 100, showLevel = 1, dateFormat = "yyyy-MM-dd")
private Date takeEffectDate; private Date takeEffectDate;
/* 医院id */ /* 医院id */
private Long hospitalId; private Long hospitalId;
......
aidea-modules/couponrecord-module/src/main/java/com/cftech/couponrecord/service/impl/CouponrecordServiceImpl.java
View file @ 36a9bb9d
...@@ -153,7 +153,18 @@ public class CouponrecordServiceImpl extends GenericServiceImpl<Couponrecord> im ...@@ -153,7 +153,18 @@ public class CouponrecordServiceImpl extends GenericServiceImpl<Couponrecord> im
} }
} else if (StringUtils.equals(lastCouponrecord.getType(), "1")) {//通过第一张开始时间获取购买数量 } else if (StringUtils.equals(lastCouponrecord.getType(), "1")) {//通过第一张开始时间获取购买数量
List<Couponrecord> lastCouponrecordList = findCouponrecordBySort("2", openid); List<Couponrecord> lastCouponrecordList = findCouponrecordBySort("2", openid);
if (lastCouponrecordList == null || lastCouponrecordList.size() == 0) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(lastCouponrecord.getCreateTime());
calendar.set(Calendar.MONTH, 0);
calendar.set(Calendar.DAY_OF_MONTH, 1);
calendar.set(Calendar.HOUR_OF_DAY, 1);
calendar.set(Calendar.MINUTE, 1);
number = buyingMedicineNumber(openid, calendar.getTime());//获取最后一张券购买数量
} else {
number = buyingMedicineNumber(openid, lastCouponrecordList.get(0).getCreateTime());//获取最后一张券购买数量 number = buyingMedicineNumber(openid, lastCouponrecordList.get(0).getCreateTime());//获取最后一张券购买数量
}
//通过第一张最后购买数量，所以只需赠送第二章 //通过第一张最后购买数量，所以只需赠送第二章
if (number >= 6) {//赠送第二张 if (number >= 6) {//赠送第二张
......
aidea-modules/couponrecord-module/src/main/java/com/cftech/couponrecord/service/impl/PdaCouponrecordServiceImpl.java
View file @ 36a9bb9d
...@@ -5,6 +5,7 @@ import com.cftech.couponrecord.dao.CouponrecordMapper; ...@@ -5,6 +5,7 @@ import com.cftech.couponrecord.dao.CouponrecordMapper;
import com.cftech.couponrecord.model.Couponrecord; import com.cftech.couponrecord.model.Couponrecord;
import com.cftech.couponrecord.service.PdaCouponrecordService; import com.cftech.couponrecord.service.PdaCouponrecordService;
import com.cftech.couponrecord.util.Md5Utils; import com.cftech.couponrecord.util.Md5Utils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; 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;
...@@ -14,6 +15,7 @@ import java.util.HashMap; ...@@ -14,6 +15,7 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
@Slf4j
@Service("pdaCouponrecordService") @Service("pdaCouponrecordService")
public class PdaCouponrecordServiceImpl implements PdaCouponrecordService { public class PdaCouponrecordServiceImpl implements PdaCouponrecordService {
...@@ -22,6 +24,7 @@ public class PdaCouponrecordServiceImpl implements PdaCouponrecordService { ...@@ -22,6 +24,7 @@ public class PdaCouponrecordServiceImpl implements PdaCouponrecordService {
private CouponrecordMapper couponrecordMapper; private CouponrecordMapper couponrecordMapper;
public JSONObject writeOff(JSONObject obj) { public JSONObject writeOff(JSONObject obj) {
log.info("pda回调接口 ,{} " + obj.toString());
JSONObject rtnJson = new JSONObject(); JSONObject rtnJson = new JSONObject();
String logId = UUID.randomUUID().toString(); String logId = UUID.randomUUID().toString();
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
......
aidea-modules/hospital-module-web/src/main/webapp/WEB-INF/views/hospital/hospitalform.html
View file @ 36a9bb9d
...@@ -297,9 +297,6 @@ ...@@ -297,9 +297,6 @@
rules: {}, rules: {},
messages: {}, messages: {},
submitHandler: function (form) { submitHandler: function (form) {
console.log(form);
console.log("==" + $("#myForm").serialize());
$("#save").attr("disabled", true); $("#save").attr("disabled", true);
$.getJSON("#springUrl('/a/hospital/formData')", $("#myForm").serialize(), function (returnobj) { $.getJSON("#springUrl('/a/hospital/formData')", $("#myForm").serialize(), function (returnobj) {
$("#save").attr("disabled", false); $("#save").attr("disabled", false);
...@@ -309,7 +306,7 @@ ...@@ -309,7 +306,7 @@
btnoktext: "继续添加", btnoktext: "继续添加",
btncanceltext: "关闭", btncanceltext: "关闭",
success: function () { success: function () {
location.href = "#springUrl('/a/hospital/form')"; location.href = "#springUrl('/a/hospital/form')?pageType=Edit";
}, },
cancel: function () { cancel: function () {
location.href = "#springUrl('/a/hospital/list')"; location.href = "#springUrl('/a/hospital/list')";
......
aidea-modules/msgrecord-module-web/src/main/webapp/WEB-INF/views/msgrecord/msgrecordlist.html
View file @ 36a9bb9d
...@@ -377,7 +377,7 @@ ...@@ -377,7 +377,7 @@
url: "#springUrl('/a/msgrecord/byUserIdFindReceiver')", url: "#springUrl('/a/msgrecord/byUserIdFindReceiver')",
data: {userId: userId, data: {userId: userId,
"_csrf": csrftoken.value, "_csrf": csrftoken.value,
"_csrf_header": csrfheader.value,}, "_csrf_header": csrfheader.value},
dataType: "json", dataType: "json",
success: function (datas) { success: function (datas) {
let arr = datas.data; let arr = datas.data;
......
aidea-modules/order-module/src/main/java/com/cftech/order/dao/OrderMapper.xml
View file @ 36a9bb9d
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
o.courier_number, o.courier_number,
o.address_des, o.address_des,
t.id as productId, t.id as productId,
CONVERT ( AES_DECRYPT( m.`name`, 'aideakey' ) USING UTF8 ) memberName, m.`name` memberName,
CONVERT ( AES_DECRYPT( m.phone, 'aideakey' ) USING UTF8 ) memberPhone, CONVERT ( AES_DECRYPT( m.phone, 'aideakey' ) USING UTF8 ) memberPhone,
a.address a.address
</sql> </sql>
...@@ -314,8 +314,8 @@ ...@@ -314,8 +314,8 @@
DATE_FORMAT(aw.create_time, '%Y-%m-%d %H:%i:%s') sendExpressDateStr, DATE_FORMAT(aw.create_time, '%Y-%m-%d %H:%i:%s') sendExpressDateStr,
DATE_FORMAT(aw.accept_express_date, '%Y-%m-%d %H:%i:%s') acceptExpressDateStr, DATE_FORMAT(aw.accept_express_date, '%Y-%m-%d %H:%i:%s') acceptExpressDateStr,
f.store fansAlias, f.store fansAlias,
CONVERT(AES_DECRYPT(f.nickname,'aideakey') USING UTF8) nickName, f.nickname nickName,
CONVERT ( AES_DECRYPT( m.`name`, 'aideakey' ) USING UTF8 ) memberName, m.`name` memberName,
CONVERT ( AES_DECRYPT( m.phone, 'aideakey' ) USING UTF8 ) memberPhone, CONVERT ( AES_DECRYPT( m.phone, 'aideakey' ) USING UTF8 ) memberPhone,
s.address, s.address,
au.status isThree, au.status isThree,
......
aidea-modules/order-module/src/main/java/com/cftech/order/service/impl/OrderServiceImpl.java
View file @ 36a9bb9d
...@@ -655,9 +655,13 @@ public class OrderServiceImpl extends GenericServiceImpl<Order> implements Order ...@@ -655,9 +655,13 @@ public class OrderServiceImpl extends GenericServiceImpl<Order> implements Order
qyuserConds.equal("t.id", order.getServiceId());//客服 qyuserConds.equal("t.id", order.getServiceId());//客服
qyusers = qyuserService.fetchSearchByPage(qyuserConds, null, 0, 0); qyusers = qyuserService.fetchSearchByPage(qyuserConds, null, 0, 0);
BigDecimal payAmount = new BigDecimal(order.getPayAmount());
BigDecimal ratio = new BigDecimal(100);
double payAmountDb = payAmount.divide(ratio).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
msg = SystemConfig.p.getProperty("QY_SEND_SERVICE_PAYMENT_SUCCESS_MAG") + order.getNumber() + "；患者昵称：" + msg = SystemConfig.p.getProperty("QY_SEND_SERVICE_PAYMENT_SUCCESS_MAG") + order.getNumber() + "；患者昵称：" +
(StringUtils.isNoneBlank(order.getNickName()) ? order.getNickName() : "") + "；患者别名：" + (StringUtils.isNoneBlank(order.getNickName()) ? order.getNickName() : "") + "；患者别名：" +
order.getFansAlias() + "；患者openid："+order.getOpenid() + "；患者付款金额：" + order.getPayAmount() + "(单位/分)"; (StringUtils.isNoneBlank(order.getFansAlias()) ? order.getFansAlias() : "")+ "；患者付款金额：" + payAmountDb + "(单位/元)";
} }
if (qyusers != null && qyusers.size() > 0) { if (qyusers != null && qyusers.size() > 0) {
......
aidea-modules/product-module-web/src/main/webapp/WEB-INF/views/product/productBatchlist.html
View file @ 36a9bb9d
...@@ -160,6 +160,10 @@ ...@@ -160,6 +160,10 @@
src="plugins/jquery-validation/js/jquery.validate.min.js"></script> src="plugins/jquery-validation/js/jquery.validate.min.js"></script>
<!-- AdminLTE for demo purposes --> <!-- AdminLTE for demo purposes -->
<script src="common/js/cfapp.js"></script> <script src="common/js/cfapp.js"></script>
<script>
var csrfheader = {name: '_csrf_header', value: '${_csrf.headerName}'};
var csrftoken = {name: '_csrf', value: '${_csrf.token}'};
</script>
<script> <script>
function formatDates(now) { function formatDates(now) {
var now = new Date(now); var now = new Date(now);
...@@ -334,7 +338,38 @@ ...@@ -334,7 +338,38 @@
function updateStatus(dom) { function updateStatus(dom) {
let id = $(dom).attr('data-id'); let id = $(dom).attr('data-id');
let status = $(dom).attr('data-status'); let status = $(dom).attr('data-status');
console.log(id + "=====" + status); Cfapp.confirm({
message: "确定要设置批次号" + (status == "0" ? "失效" : "激活") + "吗",
btnoktext: "确定",
btncanceltext: "取消",
success: function () {
$.ajax({
type: "POST",
url: "#springUrl('/a/productBatch/updateStatus')",
data: { id: id,
status: status,
_csrf: csrftoken.value,
_csrf_header: csrfheader.value},
dataType: "json",
success: function (data) {
if (data.errorNo == 0) {
Cfapp.alert({
message: "更新成功",
btntext: "确定",
success: function () {
location.href = "#springUrl('/a/productBatch/list')";
}
});
}
},
error: function () {
}
})
},
cancel: function () {
$(".modal-backdrop").fadeOut();
}
})
} }
function importExcel() { function importExcel() {
......
aidea-modules/product-module/src/main/java/com/cftech/product/dao/ProductBatchMapper.xml
View file @ 36a9bb9d
...@@ -88,7 +88,18 @@ ...@@ -88,7 +88,18 @@
<select id="fetchById" parameterType="java.lang.Long" resultMap="resultMap"> <select id="fetchById" parameterType="java.lang.Long" resultMap="resultMap">
SELECT SELECT
<include refid="sqlColumns"/>, t.id,
t.number,
t.batch_no,
t.product_id,
t.accounts_id,
t.del_flag,
t.status,
t.create_time,
t.update_time,
t.description,
t.create_by,
t.update_by,
p.product_number productCode, p.product_number productCode,
p.product_name productName, p.product_name productName,
p.common_name commonName p.common_name commonName
......
aidea-modules/product-module/src/main/java/com/cftech/product/web/ProductBatchController.java
View file @ 36a9bb9d
...@@ -16,6 +16,7 @@ import org.springframework.stereotype.Controller; ...@@ -16,6 +16,7 @@ import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
...@@ -171,7 +172,7 @@ public class ProductBatchController { ...@@ -171,7 +172,7 @@ public class ProductBatchController {
if (file == null) { if (file == null) {
return list(request, model); return list(request, model);
} }
// 构造临时路径来存储上传的文件 // 构造临时路径来存储上传的文件
String uploadPath = System.getProperty("java.io.tmpdir"); String uploadPath = System.getProperty("java.io.tmpdir");
File uploadDir = new File(uploadPath); File uploadDir = new File(uploadPath);
if (!uploadDir.exists()) { if (!uploadDir.exists()) {
...@@ -196,4 +197,26 @@ public class ProductBatchController { ...@@ -196,4 +197,26 @@ public class ProductBatchController {
return list(request, model); return list(request, model);
} }
/**
* 设置批次号激活失效
* @return
*/
@RequestMapping("/updateStatus")
@ResponseBody
public JSONObject updateStatus(@RequestParam Long id, @RequestParam String status) {
JSONObject rtnJosn = new JSONObject();
try {
ProductBatch productBatch = productBatchService.fetchById(id);
if (productBatch != null) {
productBatch.setStatus(status);
productBatchService.update(productBatch);
rtnJosn.put("errorNo", 0);
return rtnJosn;
}
} catch (Exception e) {
rtnJosn.put("errorNo", 1);
}
rtnJosn.put("errorNo", 1);
return rtnJosn;
}
} }
aidea-modules/waybill-module-web/src/main/webapp/WEB-INF/views/waybill/waybilllist.html
View file @ 36a9bb9d
...@@ -194,14 +194,10 @@ ...@@ -194,14 +194,10 @@
<th>咨询单编码</th> <th>咨询单编码</th>
<th>是否打印</th> <th>是否打印</th>
<th>粉丝昵称</th> <th>粉丝昵称</th>
<th>OpenId</th>
<th>联系人</th> <th>联系人</th>
<th>联系人手机号</th> <th>联系人手机号</th>
<th>订单员</th> <th>订单员</th>
<!-- <th>收派状态</th>-->
<th>创建时间</th> <th>创建时间</th>
<!-- <th>发件时间</th>-->
<!-- <th>收件时间</th>-->
<th>操作</th> <th>操作</th>
</tr> </tr>
</thead> </thead>
...@@ -343,10 +339,6 @@ ...@@ -343,10 +339,6 @@
"width": "100px", "width": "100px",
"mData": "nickName" "mData": "nickName"
}, },
{
"width": "120px",
"mData": "openId"
},
{ {
"width": "100px", "width": "100px",
"mData": "contact", "mData": "contact",
...@@ -380,20 +372,6 @@ ...@@ -380,20 +372,6 @@
} }
} }
}, },
// {
// "width": "80px",
// "mData": "filterResult",
// "mRender": function (a, b, c, d) {
// switch (a) {
// case "1":
// return "人工确认";
// case "2":
// return "可收派";
// case "3":
// return "不可收派";
// }
// }
// },
{ {
"width": "130px", "width": "130px",
"mData": "createTime", "mData": "createTime",
...@@ -402,28 +380,6 @@ ...@@ -402,28 +380,6 @@
} }
}, },
// {
// "width": "130px",
// "mData": "sendExpressDate",
// "mRender": function (a, b, c, d) {
// let time = formatDates(a);
// if (time.indexOf("1970") == -1) {
// return formatDates(a, "yyyy-MM-dd HH:mm:ss");
// }
// return "";
// }
// },
// {
// "width": "130px",
// "mData": "acceptExpressDate",
// "mRender": function (a, b, c, d) {
// let time = formatDates(a);
// if (time.indexOf("1970") == -1) {
// return formatDates(a, "yyyy-MM-dd HH:mm:ss");
// }
// return "";
// }
// },
{ {
"width": "120px", "width": "120px",
"mData": "id" "mData": "id"
...@@ -434,22 +390,14 @@ ...@@ -434,22 +390,14 @@
'targets': [0] 'targets': [0]
}, },
{ {
"aTargets": [12], "aTargets": [11],
"mData": "id", "mData": "id",
"mRender": function (a, b, c, d) { "mRender": function (a, b, c, d) {
var html = ''; var html = '';
html += '<div class="btn-group" style="min-width: 100px;">\n' + html += '<a href="#springUrl("/a/waybill/form?id=' + a + '")" class="btn green">查看</a>';
//'<button type="button" class="btn btn-success btn-flat">操作</button>\n' +
'<button type="button" class="btn btn-success btn-flat dropdown-toggle" data-toggle="dropdown">\n' +
' <span class="caret"></span>\n' +
' <span class="sr-only">Toggle Dropdown</span>\n' +
'</button>\n' +
'<ul class="dropdown-menu" role="menu" style="min-width: 100px;">\n';
html += '<li><a href="#springUrl("/a/waybill/form?id=' + a + '")" class="btn green">查看</a></li>';
html += '#if($shiro.hasPermission("qy:waybill:edit"))'; html += '#if($shiro.hasPermission("qy:waybill:edit"))';
html += '<li><a onclick="printerSfSdk(' + c.orderId + ')" class="btn green">打印物流单</a></li>'; html += '<a onclick="printerSfSdk(' + c.orderId + ')" class="btn green">打印物流单</a>';
html += '<li><a onclick="printSheets(' + c.orderId + ')" class="btn green">打印随行单</a></li>'; html += '<a onclick="printSheets(' + c.orderId + ')" class="btn green">打印随行单</a>';
html += '</ul>';
html += '#end'; html += '#end';
return html; return html;
} }
......
aidea-modules/waybill-module/src/main/java/com/cftech/waybill/dao/WaybillMapper.xml
View file @ 36a9bb9d
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
od.drugs_name drugsName, od.drugs_name drugsName,
od.drugs_code drugsCode, od.drugs_code drugsCode,
od.price, od.price,
AES_DECRYPT(f.nickname, 'aideakey') nickName, f.nickname nickName,
cs.consult_id consultSheetCode, cs.consult_id consultSheetCode,
qyu.name storageManageName, qyu.name storageManageName,
t.route_des routeDes, t.route_des routeDes,
...@@ -276,7 +276,7 @@ ...@@ -276,7 +276,7 @@
od.drugs_name drugsName, od.drugs_name drugsName,
od.drugs_code drugsCode, od.drugs_code drugsCode,
od.price, od.price,
AES_DECRYPT(f.nickname, 'aideakey') nickName, f.nickname nickName,
cs.consult_id consultSheetCode, cs.consult_id consultSheetCode,
CASE WHEN t.storage_manage = '1' THEN 'admin' ELSE qyu.name END storageManageName, CASE WHEN t.storage_manage = '1' THEN 'admin' ELSE qyu.name END storageManageName,
t.route_des routeDes, t.route_des routeDes,
...@@ -341,7 +341,7 @@ ...@@ -341,7 +341,7 @@
od.drugs_name drugsName, od.drugs_name drugsName,
od.drugs_code drugsCode, od.drugs_code drugsCode,
od.price, od.price,
AES_DECRYPT(f.nickname, 'aideakey') nickName, f.nickname nickName,
cs.consult_id consultSheetCode, cs.consult_id consultSheetCode,
qyu.name storageManageName, qyu.name storageManageName,
t.route_des routeDes, t.route_des routeDes,
......
cftech-common-web/src/main/resources/common.properties
View file @ 36a9bb9d
...@@ -12,7 +12,7 @@ CONSULT_SHEET_AUDIT_REFUSE_TEMPLATE_MSG=qJNaTk1KaSCha1LowafhVWS6y4rNBI5JxKP5Af9C ...@@ -12,7 +12,7 @@ CONSULT_SHEET_AUDIT_REFUSE_TEMPLATE_MSG=qJNaTk1KaSCha1LowafhVWS6y4rNBI5JxKP5Af9C
#\u54A8\u8BE2\u5355\u5BA1\u6838\u5931\u8D25\u6A21\u677F\u6D88\u606F #\u54A8\u8BE2\u5355\u5BA1\u6838\u5931\u8D25\u6A21\u677F\u6D88\u606F
CONSULT_SHEET_AUDIT_FAILED_TEMPLATE_MSG=77tLdRPQx1m8Gg0-t9HCGVOlka0G4ocFPdq8D5UkHwk CONSULT_SHEET_AUDIT_FAILED_TEMPLATE_MSG=77tLdRPQx1m8Gg0-t9HCGVOlka0G4ocFPdq8D5UkHwk
#\u75C5\u8F7D\u68C0\u6D4B\u7ED3\u679C\u901A\u77E5\u6A21\u677F\u6D88\u606F #\u75C5\u8F7D\u68C0\u6D4B\u7ED3\u679C\u901A\u77E5\u6A21\u677F\u6D88\u606F
CHECK_RESULT_TEMPLATE_MSG=5Fy77DKlvulE4L2vxsQfhOsJuRqQzIoI-LSmDYWCJt0 CHECK_RESULT_TEMPLATE_MSG=EFXXW0EuaryPpK0jYPhZxYQIA8BaHfGtY1MoVz_n6T0
#\u75C5\u8F7D\u68C0\u6D4B\u5238\u751F\u6548\u63D0\u9192 #\u75C5\u8F7D\u68C0\u6D4B\u5238\u751F\u6548\u63D0\u9192
CHECK_COUPON_TAKE_EFFECT_REMIND_TEMPLATE_MSG= CHECK_COUPON_TAKE_EFFECT_REMIND_TEMPLATE_MSG=
...@@ -83,7 +83,7 @@ jwt.duration=86400000 ...@@ -83,7 +83,7 @@ jwt.duration=86400000
#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u03AAtrue #\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u03AAtrue
security.secure=false security.secure=false
#\u662F\u5426\u96C6\u7FA4 master\u4E3Atrue #\u662F\u5426\u96C6\u7FA4 master\u4E3Atrue
quartz.isCluster=true quartz.isCluster=false
#\u987A\u4E30\u7269\u6D41\u914D\u7F6E\u4FE1\u606F\u53C2\u6570 #\u987A\u4E30\u7269\u6D41\u914D\u7F6E\u4FE1\u606F\u53C2\u6570
#\u987A\u4E30\u5BA2\u6237\u7F16\u7801 #\u987A\u4E30\u5BA2\u6237\u7F16\u7801
......
cftech-common-web/src/main/webapp/assets/adminlte/plugins/FixedColumns-3.3.2/css/fixedColumns.bootstrap.css 0 → 100644
View file @ 36a9bb9d
table.DTFC_Cloned tr {
background-color: white;
margin-bottom: 0;
}
div.DTFC_LeftHeadWrapper table,
div.DTFC_RightHeadWrapper table {
border-bottom: none !important;
margin-bottom: 0 !important;
background-color: white;
}
div.DTFC_LeftBodyWrapper table,
div.DTFC_RightBodyWrapper table {
border-top: none;
margin: 0 !important;
z-index: 2;
}
div.DTFC_LeftBodyWrapper table thead .sorting:before, div.DTFC_LeftBodyWrapper table thead .sorting:after,
div.DTFC_LeftBodyWrapper table thead .sorting_asc:before,
div.DTFC_LeftBodyWrapper table thead .sorting_asc:after,
div.DTFC_LeftBodyWrapper table thead .sorting_desc:before,
div.DTFC_LeftBodyWrapper table thead .sorting_desc:after,
div.DTFC_LeftBodyWrapper table thead .sorting:before,
div.DTFC_LeftBodyWrapper table thead .sorting:after,
div.DTFC_LeftBodyWrapper table thead .sorting_asc:before,
div.DTFC_LeftBodyWrapper table thead .sorting_asc:after,
div.DTFC_LeftBodyWrapper table thead .sorting_desc:before,
div.DTFC_LeftBodyWrapper table thead .sorting_desc:after,
div.DTFC_RightBodyWrapper table thead .sorting:before,
div.DTFC_RightBodyWrapper table thead .sorting:after,
div.DTFC_RightBodyWrapper table thead .sorting_asc:before,
div.DTFC_RightBodyWrapper table thead .sorting_asc:after,
div.DTFC_RightBodyWrapper table thead .sorting_desc:before,
div.DTFC_RightBodyWrapper table thead .sorting_desc:after,
div.DTFC_RightBodyWrapper table thead .sorting:before,
div.DTFC_RightBodyWrapper table thead .sorting:after,
div.DTFC_RightBodyWrapper table thead .sorting_asc:before,
div.DTFC_RightBodyWrapper table thead .sorting_asc:after,
div.DTFC_RightBodyWrapper table thead .sorting_desc:before,
div.DTFC_RightBodyWrapper table thead .sorting_desc:after {
display: none;
}
div.DTFC_LeftBodyWrapper table tbody tr:first-child th,
div.DTFC_LeftBodyWrapper table tbody tr:first-child td,
div.DTFC_RightBodyWrapper table tbody tr:first-child th,
div.DTFC_RightBodyWrapper table tbody tr:first-child td {
border-top: none;
}
div.DTFC_LeftFootWrapper table,
div.DTFC_RightFootWrapper table {
border-top: none;
margin-top: 0 !important;
background-color: white;
}
div.DTFC_Blocker {
background-color: white;
}
cftech-common-web/src/main/webapp/assets/adminlte/plugins/FixedColumns-3.3.2/css/fixedColumns.bootstrap.min.css 0 → 100644
View file @ 36a9bb9d
table.DTFC_Cloned tr{background-color:white;margin-bottom:0}div.DTFC_LeftHeadWrapper table,div.DTFC_RightHeadWrapper table{border-bottom:none !important;margin-bottom:0 !important;background-color:white}div.DTFC_LeftBodyWrapper table,div.DTFC_RightBodyWrapper table{border-top:none;margin:0 !important;z-index:2}div.DTFC_LeftBodyWrapper table thead .sorting:before,div.DTFC_LeftBodyWrapper table thead .sorting:after,div.DTFC_LeftBodyWrapper table thead .sorting_asc:before,div.DTFC_LeftBodyWrapper table thead .sorting_asc:after,div.DTFC_LeftBodyWrapper table thead .sorting_desc:before,div.DTFC_LeftBodyWrapper table thead .sorting_desc:after,div.DTFC_LeftBodyWrapper table thead .sorting:before,div.DTFC_LeftBodyWrapper table thead .sorting:after,div.DTFC_LeftBodyWrapper table thead .sorting_asc:before,div.DTFC_LeftBodyWrapper table thead .sorting_asc:after,div.DTFC_LeftBodyWrapper table thead .sorting_desc:before,div.DTFC_LeftBodyWrapper table thead .sorting_desc:after,div.DTFC_RightBodyWrapper table thead .sorting:before,div.DTFC_RightBodyWrapper table thead .sorting:after,div.DTFC_RightBodyWrapper table thead .sorting_asc:before,div.DTFC_RightBodyWrapper table thead .sorting_asc:after,div.DTFC_RightBodyWrapper table thead .sorting_desc:before,div.DTFC_RightBodyWrapper table thead .sorting_desc:after,div.DTFC_RightBodyWrapper table thead .sorting:before,div.DTFC_RightBodyWrapper table thead .sorting:after,div.DTFC_RightBodyWrapper table thead .sorting_asc:before,div.DTFC_RightBodyWrapper table thead .sorting_asc:after,div.DTFC_RightBodyWrapper table thead .sorting_desc:before,div.DTFC_RightBodyWrapper table thead .sorting_desc:after{display:none}div.DTFC_LeftBodyWrapper table tbody tr:first-child th,div.DTFC_LeftBodyWrapper table tbody tr:first-child td,div.DTFC_RightBodyWrapper table tbody tr:first-child th,div.DTFC_RightBodyWrapper table tbody tr:first-child td{border-top:none}div.DTFC_LeftFootWrapper table,div.DTFC_RightFootWrapper table{border-top:none;margin-top:0 !important;background-color:white}div.DTFC_Blocker{background-color:white}
cftech-common-web/src/main/webapp/assets/adminlte/plugins/FixedColumns-3.3.2/css/fixedColumns.bootstrap4.css 0 → 100644
View file @ 36a9bb9d
table.DTFC_Cloned tr {
background-color: white;
margin-bottom: 0;
}
div.DTFC_LeftHeadWrapper table,
div.DTFC_RightHeadWrapper table {
border-bottom: none !important;
margin-bottom: 0 !important;
background-color: white;
}
div.DTFC_LeftBodyWrapper table,
div.DTFC_RightBodyWrapper table {
border-top: none;
margin: 0 !important;
z-index: 2;
}
div.DTFC_LeftBodyWrapper table thead .sorting:before, div.DTFC_LeftBodyWrapper table thead .sorting:after,
div.DTFC_LeftBodyWrapper table thead .sorting_asc:before,
div.DTFC_LeftBodyWrapper table thead .sorting_asc:after,
div.DTFC_LeftBodyWrapper table thead .sorting_desc:before,
div.DTFC_LeftBodyWrapper table thead .sorting_desc:after,
div.DTFC_LeftBodyWrapper table thead .sorting:before,
div.DTFC_LeftBodyWrapper table thead .sorting:after,
div.DTFC_LeftBodyWrapper table thead .sorting_asc:before,
div.DTFC_LeftBodyWrapper table thead .sorting_asc:after,
div.DTFC_LeftBodyWrapper table thead .sorting_desc:before,
div.DTFC_LeftBodyWrapper table thead .sorting_desc:after,
div.DTFC_RightBodyWrapper table thead .sorting:before,
div.DTFC_RightBodyWrapper table thead .sorting:after,
div.DTFC_RightBodyWrapper table thead .sorting_asc:before,
div.DTFC_RightBodyWrapper table thead .sorting_asc:after,
div.DTFC_RightBodyWrapper table thead .sorting_desc:before,
div.DTFC_RightBodyWrapper table thead .sorting_desc:after,
div.DTFC_RightBodyWrapper table thead .sorting:before,
div.DTFC_RightBodyWrapper table thead .sorting:after,
div.DTFC_RightBodyWrapper table thead .sorting_asc:before,
div.DTFC_RightBodyWrapper table thead .sorting_asc:after,
div.DTFC_RightBodyWrapper table thead .sorting_desc:before,
div.DTFC_RightBodyWrapper table thead .sorting_desc:after {
display: none;
}
div.DTFC_LeftBodyWrapper table tbody tr:first-child th,
div.DTFC_LeftBodyWrapper table tbody tr:first-child td,
div.DTFC_RightBodyWrapper table tbody tr:first-child th,
div.DTFC_RightBodyWrapper table tbody tr:first-child td {
border-top: none;
}
div.DTFC_LeftFootWrapper table,
div.DTFC_RightFootWrapper table {
border-top: none;
margin-top: 0 !important;
background-color: white;
}
div.DTFC_Blocker {
background-color: white;
}
table.dataTable.table-striped.DTFC_Cloned tbody {
background-color: white;
}
cftech-common-web/src/main/webapp/assets/adminlte/plugins/FixedColumns-3.3.2/css/fixedColumns.bootstrap4.min.css 0 → 100644
View file @ 36a9bb9d
table.DTFC_Cloned tr{background-color:white;margin-bottom:0}div.DTFC_LeftHeadWrapper table,div.DTFC_RightHeadWrapper table{border-bottom:none !important;margin-bottom:0 !important;background-color:white}div.DTFC_LeftBodyWrapper table,div.DTFC_RightBodyWrapper table{border-top:none;margin:0 !important;z-index:2}div.DTFC_LeftBodyWrapper table thead .sorting:before,div.DTFC_LeftBodyWrapper table thead .sorting:after,div.DTFC_LeftBodyWrapper table thead .sorting_asc:before,div.DTFC_LeftBodyWrapper table thead .sorting_asc:after,div.DTFC_LeftBodyWrapper table thead .sorting_desc:before,div.DTFC_LeftBodyWrapper table thead .sorting_desc:after,div.DTFC_LeftBodyWrapper table thead .sorting:before,div.DTFC_LeftBodyWrapper table thead .sorting:after,div.DTFC_LeftBodyWrapper table thead .sorting_asc:before,div.DTFC_LeftBodyWrapper table thead .sorting_asc:after,div.DTFC_LeftBodyWrapper table thead .sorting_desc:before,div.DTFC_LeftBodyWrapper table thead .sorting_desc:after,div.DTFC_RightBodyWrapper table thead .sorting:before,div.DTFC_RightBodyWrapper table thead .sorting:after,div.DTFC_RightBodyWrapper table thead .sorting_asc:before,div.DTFC_RightBodyWrapper table thead .sorting_asc:after,div.DTFC_RightBodyWrapper table thead .sorting_desc:before,div.DTFC_RightBodyWrapper table thead .sorting_desc:after,div.DTFC_RightBodyWrapper table thead .sorting:before,div.DTFC_RightBodyWrapper table thead .sorting:after,div.DTFC_RightBodyWrapper table thead .sorting_asc:before,div.DTFC_RightBodyWrapper table thead .sorting_asc:after,div.DTFC_RightBodyWrapper table thead .sorting_desc:before,div.DTFC_RightBodyWrapper table thead .sorting_desc:after{display:none}div.DTFC_LeftBodyWrapper table tbody tr:first-child th,div.DTFC_LeftBodyWrapper table tbody tr:first-child td,div.DTFC_RightBodyWrapper table tbody tr:first-child th,div.DTFC_RightBodyWrapper table tbody tr:first-child td{border-top:none}div.DTFC_LeftFootWrapper table,div.DTFC_RightFootWrapper table{border-top:none;margin-top:0 !important;background-color:white}div.DTFC_Blocker{background-color:white}table.dataTable.table-striped.DTFC_Cloned tbody{background-color:white}
cftech-common-web/src/main/webapp/assets/adminlte/plugins/FixedColumns-3.3.2/css/fixedColumns.dataTables.css 0 → 100644
View file @ 36a9bb9d
table.DTFC_Cloned thead,
table.DTFC_Cloned tfoot {
background-color: white;
}
div.DTFC_Blocker {
background-color: white;
}
div.DTFC_LeftWrapper table.dataTable,
div.DTFC_RightWrapper table.dataTable {
margin-bottom: 0;
z-index: 2;
}
div.DTFC_LeftWrapper table.dataTable.no-footer,
div.DTFC_RightWrapper table.dataTable.no-footer {
border-bottom: none;
}
table.dataTable.display tbody tr.DTFC_NoData {
background-color: transparent;
}
cftech-common-web/src/main/webapp/assets/adminlte/plugins/FixedColumns-3.3.2/css/fixedColumns.dataTables.min.css 0 → 100644
View file @ 36a9bb9d
table.DTFC_Cloned thead,table.DTFC_Cloned tfoot{background-color:white}div.DTFC_Blocker{background-color:white}div.DTFC_LeftWrapper table.dataTable,div.DTFC_RightWrapper table.dataTable{margin-bottom:0;z-index:2}div.DTFC_LeftWrapper table.dataTable.no-footer,div.DTFC_RightWrapper table.dataTable.no-footer{border-bottom:none}table.dataTable.display tbody tr.DTFC_NoData{background-color:transparent}
cftech-common-web/src/main/webapp/assets/adminlte/plugins/FixedColumns-3.3.2/css/fixedColumns.foundation.css 0 → 100644
View file @ 36a9bb9d
div.DTFC_LeftHeadWrapper table,
div.DTFC_LeftBodyWrapper table,
div.DTFC_LeftFootWrapper table {
border-right-width: 0;
}
div.DTFC_RightHeadWrapper table,
div.DTFC_RightBodyWrapper table,
div.DTFC_RightFootWrapper table {
border-left-width: 0;
}
div.DTFC_LeftHeadWrapper table,
div.DTFC_RightHeadWrapper table {
margin-bottom: 0 !important;
}
div.DTFC_LeftBodyWrapper table,
div.DTFC_RightBodyWrapper table {
border-top: none;
margin: 0 !important;
}
div.DTFC_LeftFootWrapper table,
div.DTFC_RightFootWrapper table {
margin-top: 0 !important;
z-index: 2;
}
div.DTFC_Blocker {
background-color: white;
}
cftech-common-web/src/main/webapp/assets/adminlte/plugins/FixedColumns-3.3.2/css/fixedColumns.foundation.min.css 0 → 100644
View file @ 36a9bb9d
div.DTFC_LeftHeadWrapper table,div.DTFC_LeftBodyWrapper table,div.DTFC_LeftFootWrapper table{border-right-width:0}div.DTFC_RightHeadWrapper table,div.DTFC_RightBodyWrapper table,div.DTFC_RightFootWrapper table{border-left-width:0}div.DTFC_LeftHeadWrapper table,div.DTFC_RightHeadWrapper table{margin-bottom:0 !important}div.DTFC_LeftBodyWrapper table,div.DTFC_RightBodyWrapper table{border-top:none;margin:0 !important}div.DTFC_LeftFootWrapper table,div.DTFC_RightFootWrapper table{margin-top:0 !important;z-index:2}div.DTFC_Blocker{background-color:white}
cftech-common-web/src/main/webapp/assets/adminlte/plugins/FixedColumns-3.3.2/css/fixedColumns.jqueryui.css 0 → 100644
View file @ 36a9bb9d
div.DTFC_LeftWrapper table.dataTable,
div.DTFC_RightWrapper table.dataTable {
z-index: 2;
}
div.DTFC_LeftWrapper table.dataTable.no-footer,
div.DTFC_RightWrapper table.dataTable.no-footer {
border-bottom: none;
}
div.DTFC_Blocker {
background-color: white;
}
cftech-common-web/src/main/webapp/assets/adminlte/plugins/FixedColumns-3.3.2/css/fixedColumns.jqueryui.min.css 0 → 100644
View file @ 36a9bb9d
div.DTFC_LeftWrapper table.dataTable,div.DTFC_RightWrapper table.dataTable{z-index:2}div.DTFC_LeftWrapper table.dataTable.no-footer,div.DTFC_RightWrapper table.dataTable.no-footer{border-bottom:none}div.DTFC_Blocker{background-color:white}
cftech-common-web/src/main/webapp/assets/adminlte/plugins/FixedColumns-3.3.2/css/fixedColumns.semanticui.css 0 → 100644
View file @ 36a9bb9d
div.DTFC_LeftWrapper table.ui.table.dataTable {
border-right: none;
}
div.DTFC_RightWrapper table.ui.table.dataTable {
border-left: none;
}
div.DTFC_Blocker {
background-color: white;
}
div.DTFC_LeftWrapper table.dataTable,
div.DTFC_RightWrapper table.dataTable {
z-index: 2;
}
div.DTFC_LeftHeadWrapper table.ui.table.dataTable,
div.DTFC_RightHeadWrapper table.ui.table.dataTable {
border-bottom: none;
}
div.DTFC_LeftBodyWrapper table.ui.table.dataTable,
div.DTFC_RightBodyWrapper table.ui.table.dataTable {
border-top: none;
}
div.DTFC_LeftBodyWrapper table.ui.table.dataTable thead .sorting:after,
div.DTFC_LeftBodyWrapper table.ui.table.dataTable thead .sorting_asc:after,
div.DTFC_LeftBodyWrapper table.ui.table.dataTable thead .sorting_desc:after,
div.DTFC_LeftBodyWrapper table.ui.table.dataTable thead .sorting:after,
div.DTFC_LeftBodyWrapper table.ui.table.dataTable thead .sorting_asc:after,
div.DTFC_LeftBodyWrapper table.ui.table.dataTable thead .sorting_desc:after,
div.DTFC_RightBodyWrapper table.ui.table.dataTable thead .sorting:after,
div.DTFC_RightBodyWrapper table.ui.table.dataTable thead .sorting_asc:after,
div.DTFC_RightBodyWrapper table.ui.table.dataTable thead .sorting_desc:after,
div.DTFC_RightBodyWrapper table.ui.table.dataTable thead .sorting:after,
div.DTFC_RightBodyWrapper table.ui.table.dataTable thead .sorting_asc:after,
div.DTFC_RightBodyWrapper table.ui.table.dataTable thead .sorting_desc:after {
display: none;
}
cftech-common-web/src/main/webapp/assets/adminlte/plugins/FixedColumns-3.3.2/css/fixedColumns.semanticui.min.css 0 → 100644
View file @ 36a9bb9d
div.DTFC_LeftWrapper table.ui.table.dataTable{border-right:none}div.DTFC_RightWrapper table.ui.table.dataTable{border-left:none}div.DTFC_Blocker{background-color:white}div.DTFC_LeftWrapper table.dataTable,div.DTFC_RightWrapper table.dataTable{z-index:2}div.DTFC_LeftHeadWrapper table.ui.table.dataTable,div.DTFC_RightHeadWrapper table.ui.table.dataTable{border-bottom:none}div.DTFC_LeftBodyWrapper table.ui.table.dataTable,div.DTFC_RightBodyWrapper table.ui.table.dataTable{border-top:none}div.DTFC_LeftBodyWrapper table.ui.table.dataTable thead .sorting:after,div.DTFC_LeftBodyWrapper table.ui.table.dataTable thead .sorting_asc:after,div.DTFC_LeftBodyWrapper table.ui.table.dataTable thead .sorting_desc:after,div.DTFC_LeftBodyWrapper table.ui.table.dataTable thead .sorting:after,div.DTFC_LeftBodyWrapper table.ui.table.dataTable thead .sorting_asc:after,div.DTFC_LeftBodyWrapper table.ui.table.dataTable thead .sorting_desc:after,div.DTFC_RightBodyWrapper table.ui.table.dataTable thead .sorting:after,div.DTFC_RightBodyWrapper table.ui.table.dataTable thead .sorting_asc:after,div.DTFC_RightBodyWrapper table.ui.table.dataTable thead .sorting_desc:after,div.DTFC_RightBodyWrapper table.ui.table.dataTable thead .sorting:after,div.DTFC_RightBodyWrapper table.ui.table.dataTable thead .sorting_asc:after,div.DTFC_RightBodyWrapper table.ui.table.dataTable thead .sorting_desc:after{display:none}
cftech-common-web/src/main/webapp/assets/adminlte/plugins/FixedColumns-3.3.2/js/fixedColumns.bootstrap.js 0 → 100644
View file @ 36a9bb9d
/*! Bootstrap 3 styling wrapper for FixedColumns
* ©2018 SpryMedia Ltd - datatables.net/license
*/
(function( factory ){
if ( typeof define === 'function' && define.amd ) {
// AMD
define( ['jquery', 'datatables.net-bs', 'datatables.net-fixedcolumns'], function ( $ ) {
return factory( $, window, document );
} );
}
else if ( typeof exports === 'object' ) {
// CommonJS
module.exports = function (root, $) {
if ( ! root ) {
root = window;
}
if ( ! $ || ! $.fn.dataTable ) {
$ = require('datatables.net-bs')(root, $).$;
}
if ( ! $.fn.dataTable.FixedColumns ) {
require('datatables.net-fixedcolumns')(root, $);
}
return factory( $, root, root.document );
};
}
else {
// Browser
factory( jQuery, window, document );
}
}(function( $, window, document, undefined ) {
return $.fn.dataTable;
}));
\ No newline at end of file
cftech-common-web/src/main/webapp/assets/adminlte/plugins/FixedColumns-3.3.2/js/fixedColumns.bootstrap.min.js 0 → 100644
View file @ 36a9bb9d
/*!
Bootstrap 3 styling wrapper for FixedColumns
©2018 SpryMedia Ltd - datatables.net/license
*/
(function(c){"function"===typeof define&&define.amd?define(["jquery","datatables.net-bs","datatables.net-fixedcolumns"],function(a){return c(a,window,document)}):"object"===typeof exports?module.exports=function(a,b){a||(a=window);b&&b.fn.dataTable||(b=require("datatables.net-bs")(a,b).$);b.fn.dataTable.FixedColumns||require("datatables.net-fixedcolumns")(a,b);return c(b,a,a.document)}:c(jQuery,window,document)})(function(c,a,b,d){return c.fn.dataTable});
cftech-common-web/src/main/webapp/assets/adminlte/plugins/FixedColumns-3.3.2/js/fixedColumns.bootstrap4.js 0 → 100644
View file @ 36a9bb9d
/*! Bootstrap 4 styling wrapper for FixedColumns
* ©2018 SpryMedia Ltd - datatables.net/license
*/
(function( factory ){
if ( typeof define === 'function' && define.amd ) {
// AMD
define( ['jquery', 'datatables.net-bs4', 'datatables.net-fixedcolumns'], function ( $ ) {
return factory( $, window, document );
} );
}
else if ( typeof exports === 'object' ) {
// CommonJS
module.exports = function (root, $) {
if ( ! root ) {
root = window;
}
if ( ! $ || ! $.fn.dataTable ) {
$ = require('datatables.net-bs4')(root, $).$;
}
if ( ! $.fn.dataTable.FixedColumns ) {
require('datatables.net-fixedcolumns')(root, $);
}
return factory( $, root, root.document );
};
}
else {
// Browser
factory( jQuery, window, document );
}
}(function( $, window, document, undefined ) {
return $.fn.dataTable;
}));
\ No newline at end of file
cftech-common-web/src/main/webapp/assets/adminlte/plugins/FixedColumns-3.3.2/js/fixedColumns.bootstrap4.min.js 0 → 100644
View file @ 36a9bb9d
/*!
Bootstrap 4 styling wrapper for FixedColumns
©2018 SpryMedia Ltd - datatables.net/license
*/
(function(c){"function"===typeof define&&define.amd?define(["jquery","datatables.net-bs4","datatables.net-fixedcolumns"],function(a){return c(a,window,document)}):"object"===typeof exports?module.exports=function(a,b){a||(a=window);b&&b.fn.dataTable||(b=require("datatables.net-bs4")(a,b).$);b.fn.dataTable.FixedColumns||require("datatables.net-fixedcolumns")(a,b);return c(b,a,a.document)}:c(jQuery,window,document)})(function(c,a,b,d){return c.fn.dataTable});
cftech-common-web/src/main/webapp/assets/adminlte/plugins/FixedColumns-3.3.2/js/fixedColumns.dataTables.js 0 → 100644
View file @ 36a9bb9d
/*! DataTables styling wrapper for FixedColumns
* ©2018 SpryMedia Ltd - datatables.net/license
*/
(function( factory ){
if ( typeof define === 'function' && define.amd ) {
// AMD
define( ['jquery', 'datatables.net-dt', 'datatables.net-fixedcolumns'], function ( $ ) {
return factory( $, window, document );
} );
}
else if ( typeof exports === 'object' ) {
// CommonJS
module.exports = function (root, $) {
if ( ! root ) {
root = window;
}
if ( ! $ || ! $.fn.dataTable ) {
$ = require('datatables.net-dt')(root, $).$;
}
if ( ! $.fn.dataTable.FixedColumns ) {
require('datatables.net-fixedcolumns')(root, $);
}
return factory( $, root, root.document );
};
}
else {
// Browser
factory( jQuery, window, document );
}
}(function( $, window, document, undefined ) {
return $.fn.dataTable;
}));
\ No newline at end of file
cftech-common-web/src/main/webapp/assets/adminlte/plugins/FixedColumns-3.3.2/js/fixedColumns.foundation.js 0 → 100644
View file @ 36a9bb9d
/*! Foundation styling wrapper for FixedColumns
* ©2018 SpryMedia Ltd - datatables.net/license
*/
(function( factory ){
if ( typeof define === 'function' && define.amd ) {
// AMD
define( ['jquery', 'datatables.net-zf', 'datatables.net-fixedcolumns'], function ( $ ) {
return factory( $, window, document );
} );
}
else if ( typeof exports === 'object' ) {
// CommonJS
module.exports = function (root, $) {
if ( ! root ) {
root = window;
}
if ( ! $ || ! $.fn.dataTable ) {
$ = require('datatables.net-zf')(root, $).$;
}
if ( ! $.fn.dataTable.FixedColumns ) {
require('datatables.net-fixedcolumns')(root, $);
}
return factory( $, root, root.document );
};
}
else {
// Browser
factory( jQuery, window, document );
}
}(function( $, window, document, undefined ) {
return $.fn.dataTable;
}));
\ No newline at end of file
cftech-common-web/src/main/webapp/assets/adminlte/plugins/FixedColumns-3.3.2/js/fixedColumns.foundation.min.js 0 → 100644
View file @ 36a9bb9d
/*!
Foundation styling wrapper for FixedColumns
©2018 SpryMedia Ltd - datatables.net/license
*/
(function(c){"function"===typeof define&&define.amd?define(["jquery","datatables.net-zf","datatables.net-fixedcolumns"],function(a){return c(a,window,document)}):"object"===typeof exports?module.exports=function(a,b){a||(a=window);b&&b.fn.dataTable||(b=require("datatables.net-zf")(a,b).$);b.fn.dataTable.FixedColumns||require("datatables.net-fixedcolumns")(a,b);return c(b,a,a.document)}:c(jQuery,window,document)})(function(c,a,b,d){return c.fn.dataTable});
cftech-common-web/src/main/webapp/assets/adminlte/plugins/FixedColumns-3.3.2/js/fixedColumns.jqueryui.js 0 → 100644
View file @ 36a9bb9d
/*! jQuery UI styling wrapper for FixedColumns
* ©2018 SpryMedia Ltd - datatables.net/license
*/
(function( factory ){
if ( typeof define === 'function' && define.amd ) {
// AMD
define( ['jquery', 'datatables.net-jqui', 'datatables.net-fixedcolumns'], function ( $ ) {
return factory( $, window, document );
} );
}
else if ( typeof exports === 'object' ) {
// CommonJS
module.exports = function (root, $) {
if ( ! root ) {
root = window;
}
if ( ! $ || ! $.fn.dataTable ) {
$ = require('datatables.net-jqui')(root, $).$;
}
if ( ! $.fn.dataTable.FixedColumns ) {
require('datatables.net-fixedcolumns')(root, $);
}
return factory( $, root, root.document );
};
}
else {
// Browser
factory( jQuery, window, document );
}
}(function( $, window, document, undefined ) {
return $.fn.dataTable;
}));
\ No newline at end of file
cftech-common-web/src/main/webapp/assets/adminlte/plugins/FixedColumns-3.3.2/js/fixedColumns.jqueryui.min.js 0 → 100644
View file @ 36a9bb9d
/*!
jQuery UI styling wrapper for FixedColumns
©2018 SpryMedia Ltd - datatables.net/license
*/
(function(c){"function"===typeof define&&define.amd?define(["jquery","datatables.net-jqui","datatables.net-fixedcolumns"],function(a){return c(a,window,document)}):"object"===typeof exports?module.exports=function(a,b){a||(a=window);b&&b.fn.dataTable||(b=require("datatables.net-jqui")(a,b).$);b.fn.dataTable.FixedColumns||require("datatables.net-fixedcolumns")(a,b);return c(b,a,a.document)}:c(jQuery,window,document)})(function(c,a,b,d){return c.fn.dataTable});
cftech-common-web/src/main/webapp/assets/adminlte/plugins/FixedColumns-3.3.2/js/fixedColumns.semanticui.js 0 → 100644
View file @ 36a9bb9d
/*! Semanic UI styling wrapper for FixedColumns
* ©2018 SpryMedia Ltd - datatables.net/license
*/
(function( factory ){
if ( typeof define === 'function' && define.amd ) {
// AMD
define( ['jquery', 'datatables.net-se', 'datatables.net-fixedcolumns'], function ( $ ) {
return factory( $, window, document );
} );
}
else if ( typeof exports === 'object' ) {
// CommonJS
module.exports = function (root, $) {
if ( ! root ) {
root = window;
}
if ( ! $ || ! $.fn.dataTable ) {
$ = require('datatables.net-se')(root, $).$;
}
if ( ! $.fn.dataTable.FixedColumns ) {
require('datatables.net-fixedcolumns')(root, $);
}
return factory( $, root, root.document );
};
}
else {
// Browser
factory( jQuery, window, document );
}
}(function( $, window, document, undefined ) {
return $.fn.dataTable;
}));
\ No newline at end of file
cftech-common-web/src/main/webapp/assets/adminlte/plugins/FixedColumns-3.3.2/js/fixedColumns.semanticui.min.js 0 → 100644
View file @ 36a9bb9d
/*!
Semanic UI styling wrapper for FixedColumns
©2018 SpryMedia Ltd - datatables.net/license
*/
(function(c){"function"===typeof define&&define.amd?define(["jquery","datatables.net-se","datatables.net-fixedcolumns"],function(a){return c(a,window,document)}):"object"===typeof exports?module.exports=function(a,b){a||(a=window);b&&b.fn.dataTable||(b=require("datatables.net-se")(a,b).$);b.fn.dataTable.FixedColumns||require("datatables.net-fixedcolumns")(a,b);return c(b,a,a.document)}:c(jQuery,window,document)})(function(c,a,b,d){return c.fn.dataTable});
membercard-modules/member-module/src/main/java/com/cftech/member/dao/MemberMapper.xml
View file @ 36a9bb9d
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
<sql id="sqlColumnslist"> <sql id="sqlColumnslist">
id, id,
number, number,
CONVERT(AES_DECRYPT(name,'aideakey') USING UTF8) name, name,
CONVERT(AES_DECRYPT(phone,'aideakey') USING UTF8) phone, CONVERT(AES_DECRYPT(phone,'aideakey') USING UTF8) phone,
imageurl, imageurl,
cardid, cardid,
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
( (
#{id, jdbcType=BIGINT}, #{id, jdbcType=BIGINT},
#{number, jdbcType=VARCHAR}, #{number, jdbcType=VARCHAR},
AES_ENCRYPT(#{name, jdbcType=VARBINARY},'aideakey'), #{name, jdbcType=VARCHAR},
AES_ENCRYPT(#{phone, jdbcType=VARBINARY},'aideakey'), AES_ENCRYPT(#{phone, jdbcType=VARBINARY},'aideakey'),
#{imageurl, jdbcType=VARCHAR}, #{imageurl, jdbcType=VARCHAR},
#{cardid, jdbcType=VARCHAR}, #{cardid, jdbcType=VARCHAR},
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
SELECT SELECT
t.id, t.id,
t.number, t.number,
CONVERT( AES_DECRYPT(t.name,'aideakey') USING UTF8) t.name , t.name,
CONVERT( AES_DECRYPT( t.phone,'aideakey') USING UTF8) t.phone, CONVERT( AES_DECRYPT( t.phone,'aideakey') USING UTF8) t.phone,
t.imageurl, t.imageurl,
t.cardid, t.cardid,
...@@ -206,7 +206,7 @@ ...@@ -206,7 +206,7 @@
SELECT SELECT
member.id, member.id,
member.number, member.number,
CONVERT(AES_DECRYPT(member.name,'aideakey') USING UTF8) member.name, member.name,
member.surname, member.surname,
CONVERT(AES_DECRYPT(member.phone,'aideakey') USING UTF8) member.phone, CONVERT(AES_DECRYPT(member.phone,'aideakey') USING UTF8) member.phone,
member.imageurl, member.imageurl,
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
number = #{number, jdbcType=VARCHAR}, number = #{number, jdbcType=VARCHAR},
</if> </if>
<if test="name != null"> <if test="name != null">
name = AES_ENCRYPT(#{name, jdbcType=VARBINARY},'aideakey'), name = #{name, jdbcType=VARCHAR},
</if> </if>
<if test="surname!=null"> <if test="surname!=null">
surname = #{surname}, surname = #{surname},
...@@ -326,7 +326,7 @@ ...@@ -326,7 +326,7 @@
m.id, m.id,
m.imageurl, m.imageurl,
m.sex, m.sex,
CONVERT(AES_DECRYPT(m.name,'aideakey') USING UTF8) as name, m.name,
CONVERT(AES_DECRYPT(m.phone,'aideakey') USING UTF8) as phone, CONVERT(AES_DECRYPT(m.phone,'aideakey') USING UTF8) as phone,
m.open_id AS openId, m.open_id AS openId,
m.create_time as createTime, m.create_time as createTime,
...@@ -348,7 +348,7 @@ ...@@ -348,7 +348,7 @@
<!--个人信息回填 <!--个人信息回填
--> -->
<select id="memberFormation" parameterType="java.lang.String" resultType="com.cftech.member.model.MemberVO"> <select id="memberFormation" parameterType="java.lang.String" resultType="com.cftech.member.model.MemberVO">
SELECT id,CONVERT(AES_DECRYPT(name,'aideakey') USING UTF8) AS memberName, sex, CONVERT(AES_DECRYPT(birthday,'aideakey')USING UTF8) birthday, imageurl, SELECT id,name memberName, sex, CONVERT(AES_DECRYPT(birthday,'aideakey')USING UTF8) birthday, imageurl,
CONVERT(AES_DECRYPT(email,'aideakey')USING UTF8) AS mailbox, CONVERT(AES_DECRYPT(phone,'aideakey')USING UTF8) as phone, cardid CONVERT(AES_DECRYPT(email,'aideakey')USING UTF8) AS mailbox, CONVERT(AES_DECRYPT(phone,'aideakey')USING UTF8) as phone, cardid
FROM wx_mp_member WHERE open_id = #{openid} and del_flag=0 FROM wx_mp_member WHERE open_id = #{openid} and del_flag=0
</select> </select>
...@@ -357,7 +357,7 @@ ...@@ -357,7 +357,7 @@
SELECT SELECT
f.id, f.id,
f.openid, f.openid,
CONVERT(AES_DECRYPT(f.nickname,'aideakey') USING UTF8) nickname, f.nickname nickname,
f.headimgurl, f.headimgurl,
CASE WHEN au.id IS NOT NULL THEN '1' ELSE '0' END isThree CASE WHEN au.id IS NOT NULL THEN '1' ELSE '0' END isThree
FROM wx_mp_fanss f FROM wx_mp_fanss f
...@@ -371,7 +371,7 @@ ...@@ -371,7 +371,7 @@
update wx_mp_member update wx_mp_member
<set> <set>
<if test="memberName !=null"> <if test="memberName !=null">
`name` = AES_ENCRYPT(#{memberName},'aideakey'), `name` = #{memberName},
</if> </if>
<if test="sex !=null"> <if test="sex !=null">
sex = #{sex}, sex = #{sex},
......
membercard-modules/member-module/src/main/java/com/cftech/member/service/impl/MemberServiceImpl.java
View file @ 36a9bb9d
...@@ -123,8 +123,11 @@ public class MemberServiceImpl extends GenericServiceImpl<Member> implements Mem ...@@ -123,8 +123,11 @@ public class MemberServiceImpl extends GenericServiceImpl<Member> implements Mem
rtnJson.put("errorNo", "0"); rtnJson.put("errorNo", "0");
rtnJson.put("data", member); rtnJson.put("data", member);
} else { } else {
MpFanssEntity fanssEntity = fanssService.getWxUser(openid);
MemberVO member = memberVOS.get(0);
member.setImageUrl(fanssEntity.getHeadimgurl());
rtnJson.put("errorNo", "0"); rtnJson.put("errorNo", "0");
rtnJson.put("data", memberVOS.get(0)); rtnJson.put("data", member);
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
......
membercard-modules/member-module/src/main/java/com/cftech/member/web/MemberController.java
View file @ 36a9bb9d
...@@ -175,7 +175,7 @@ public class MemberController { ...@@ -175,7 +175,7 @@ public class MemberController {
// } // }
if (!StringUtils.isEmpty(member.getName())) { if (!StringUtils.isEmpty(member.getName())) {
conds.like("CONVERT(AES_DECRYPT(m.name,'aideakey') USING UTF8)", member.getName()); conds.like("m.name", member.getName());
} }
if (!StringUtils.isEmpty(member.getPhone())) { if (!StringUtils.isEmpty(member.getPhone())) {
conds.like("CONVERT(AES_DECRYPT(m.phone,'aideakey') USING UTF8)", member.getPhone()); conds.like("CONVERT(AES_DECRYPT(m.phone,'aideakey') USING UTF8)", member.getPhone());
...@@ -261,7 +261,7 @@ public class MemberController { ...@@ -261,7 +261,7 @@ public class MemberController {
conds.equal("m.del_flag", Constants.DEL_FLAG_0); conds.equal("m.del_flag", Constants.DEL_FLAG_0);
if (!StringUtils.isEmpty(member.getName())) { if (!StringUtils.isEmpty(member.getName())) {
conds.like("CONVERT(AES_DECRYPT(m.name,'aideakey') USING UTF8)", member.getName()); conds.like("m.name", member.getName());
} }
if (!StringUtils.isEmpty(member.getPhone())) { if (!StringUtils.isEmpty(member.getPhone())) {
......
membercard-modules/shipping-address-module/src/main/java/com/cftech/addresst/dao/AddressMapper.xml
View file @ 36a9bb9d
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
<select id="fetchById" parameterType="java.lang.Long" resultMap="resultMap"> <select id="fetchById" parameterType="java.lang.Long" resultMap="resultMap">
SELECT SELECT
<include refid="sqlColumns"/>, <include refid="sqlColumns"/>,
CONVERT(AES_DECRYPT(f.nickname, 'aideakey') USING UTF8) nickName f.nickname nickName
FROM t_shipping_address t FROM t_shipping_address t
LEFT JOIN wx_mp_fanss f ON t.open_id = f.openid AND f.delflag = '0' LEFT JOIN wx_mp_fanss f ON t.open_id = f.openid AND f.delflag = '0'
LEFT JOIN area a ON t.province_id = a.areaid LEFT JOIN area a ON t.province_id = a.areaid
......
mp-modules/mp-fanss-module/src/main/java/com/cftech/mp/fans/controller/MpFanssController.java
View file @ 36a9bb9d
...@@ -94,7 +94,7 @@ public class MpFanssController { ...@@ -94,7 +94,7 @@ public class MpFanssController {
conds.equal("source", mpFanssEntity.getSource()); conds.equal("source", mpFanssEntity.getSource());
} }
if (StringUtils.isNotBlank(mpFanssEntity.getNickname())) { if (StringUtils.isNotBlank(mpFanssEntity.getNickname())) {
conds.like("CONVERT(AES_DECRYPT(nickname,'aideakey') USING UTF8)", mpFanssEntity.getNickname()); conds.like("nickname", mpFanssEntity.getNickname());
} }
if (StringUtils.isNotBlank(startTime)) { if (StringUtils.isNotBlank(startTime)) {
conds.greatEqual("subscribetime", startTime); conds.greatEqual("subscribetime", startTime);
...@@ -135,7 +135,7 @@ public class MpFanssController { ...@@ -135,7 +135,7 @@ public class MpFanssController {
conds.equal("source", mpFanssEntity.getSource()); conds.equal("source", mpFanssEntity.getSource());
} }
if (StringUtils.isNotBlank(mpFanssEntity.getNickname())) { if (StringUtils.isNotBlank(mpFanssEntity.getNickname())) {
conds.like("CONVERT(AES_DECRYPT(nickname,'aideakey') USING UTF8)", mpFanssEntity.getNickname()); conds.like("nickname USING UTF8)", mpFanssEntity.getNickname());
} }
if (StringUtils.isNotBlank(startTime)) { if (StringUtils.isNotBlank(startTime)) {
conds.greatEqual("t.subscribetime", startTime); conds.greatEqual("t.subscribetime", startTime);
......
mp-modules/mp-fanss-module/src/main/java/com/cftech/mp/fans/dao/MpFanssMapper.xml
View file @ 36a9bb9d
...@@ -49,12 +49,12 @@ ...@@ -49,12 +49,12 @@
<sql id="Base_Column_List_Store"> <sql id="Base_Column_List_Store">
t.id, t.openid,t.canceltime, t.id, t.openid,t.canceltime,
CONVERT(AES_DECRYPT(t.nickname,'aideakey') USING UTF8) nickname,t.sex, CONVERT(AES_DECRYPT(t.city,'aideakey') USING UTF8) city,CONVERT(AES_DECRYPT(t.province,'aideakey') USING UTF8) province,t.country,t.headimgurl,t.createtime,t.subscribetime, t.nickname nickname,t.sex, CONVERT(AES_DECRYPT(t.city,'aideakey') USING UTF8) city,CONVERT(AES_DECRYPT(t.province,'aideakey') USING UTF8) province,t.country,t.headimgurl,t.createtime,t.subscribetime,
t.delflag,t.status,t.source t.delflag,t.status,t.source
</sql> </sql>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, openid, canceltime, CONVERT(AES_DECRYPT(nickname,'aideakey') USING UTF8) nickname, sex,CONVERT(AES_DECRYPT(city,'aideakey') USING UTF8) city,CONVERT(AES_DECRYPT(province,'aideakey') USING UTF8) province,country,country,headimgurl,createtime,subscribetime,delflag,status,source,recommender,store,taglist id, openid, canceltime, nickname nickname, sex,CONVERT(AES_DECRYPT(city,'aideakey') USING UTF8) city,CONVERT(AES_DECRYPT(province,'aideakey') USING UTF8) province,country,country,headimgurl,createtime,subscribetime,delflag,status,source,recommender,store,taglist
</sql> </sql>
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
sex,city,province,country,delflag,headimgurl, sex,city,province,country,delflag,headimgurl,
subscribetime,createtime,timestamp,updatetime,mpaccountid,userid,taglist,status,recommender,store,source,description,unionid) subscribetime,createtime,timestamp,updatetime,mpaccountid,userid,taglist,status,recommender,store,source,description,unionid)
values (#{openid,jdbcType=VARCHAR}, values (#{openid,jdbcType=VARCHAR},
AES_ENCRYPT( #{nickname,jdbcType=VARBINARY},'aideakey'), #{nickname,jdbcType=VARCHAR},
#{sex,jdbcType=VARCHAR}, #{sex,jdbcType=VARCHAR},
AES_ENCRYPT(#{city,jdbcType=VARBINARY},'aideakey'), AES_ENCRYPT(#{city,jdbcType=VARBINARY},'aideakey'),
AES_ENCRYPT( #{province,jdbcType=VARBINARY},'aideakey'), AES_ENCRYPT( #{province,jdbcType=VARBINARY},'aideakey'),
...@@ -162,7 +162,6 @@ ...@@ -162,7 +162,6 @@
<update id="updateByPrimaryKey" parameterType="com.cftech.mp.fans.model.MpFanssEntity"> <update id="updateByPrimaryKey" parameterType="com.cftech.mp.fans.model.MpFanssEntity">
update wx_mp_fanss update wx_mp_fanss
<set> <set>
<if test="encodingaeskey != null"> <if test="encodingaeskey != null">
encodingaeskey = #{encodingaeskey,jdbcType=VARCHAR}, encodingaeskey = #{encodingaeskey,jdbcType=VARCHAR},
</if> </if>
...@@ -237,7 +236,7 @@ ...@@ -237,7 +236,7 @@
id = #{id}, id = #{id},
</if> </if>
<if test="nickname != null"> <if test="nickname != null">
nickname = AES_ENCRYPT(#{nickname},'aideakey'), nickname = #{nickname},
</if> </if>
<if test="sex != null"> <if test="sex != null">
sex = #{sex}, sex = #{sex},
......
qy-modules/qy-orgunit-module-web/src/main/webapp/WEB-INF/views/managerqyuser/qyuseradd.html
View file @ 36a9bb9d
...@@ -176,6 +176,7 @@ ...@@ -176,6 +176,7 @@
<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>
<select name="positionId" class="form-control pull-right"> <select name="positionId" class="form-control pull-right">
<option value="">请选择职位</option>
#foreach($item in $positions) #foreach($item in $positions)
<option label="${item.name}" value="${item.id}" #if($item.id == $data.positionId) selected #end>${item.name}</option> <option label="${item.name}" value="${item.id}" #if($item.id == $data.positionId) selected #end>${item.name}</option>
#end #end
......
qy-modules/qy-orgunit-module/src/main/java/com/cftech/base/org/dao/QyuserMapper.xml
View file @ 36a9bb9d
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
SELECT SELECT
t.id, t.name, t.qrcode, t.avatar, t.mobile, t.email, t.role, t.wxno, t.gender, t.accounts_id, t.id, t.name, t.qrcode, t.avatar, t.mobile, t.email, t.role, t.wxno, t.gender, t.accounts_id,
t.store_id, t.store_name, t.wxuser_id, t.org_id, t.tag_ids, t.status, t.create_time, t.store_id, t.store_name, t.wxuser_id, t.org_id, t.tag_ids, t.status, t.create_time,
t.update_time, t.description, t.del_flag, t.create_by, t.update_by,u.username loginName, t.user_type, t.peak_val, t.assigned, t.un_assigned t.update_time, t.description, t.del_flag, t.create_by, t.update_by,u.username loginName, t.user_type, t.peak_val, t.assigned, t.un_assigned, t.position_id
FROM t_qyuser t FROM t_qyuser t
left join user u on u.userid=t.id left join user u on u.userid=t.id
WHERE t.id=#{id} WHERE t.id=#{id}
......
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