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

Skip to content

L
liquidnet-bus-v1
Commit aecfc8de authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

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

parents 6a8fbe17 05f4f8e0
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 9 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/admin/upush/create.html
View file @ aecfc8de
......@@ -53,7 +53,7 @@
</select>
</div>
<div class="col-sm-5">
<input class="form-control" type="text" placeholder="请填写url" id="targetObjInput">
<input style="display: none" class="form-control" type="text" placeholder="请填写url" id="targetObjInput">
<div hidden class="row" id="targetObjSelectShow">
<div class="col-lg-6">
<div class="input-group">
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performancesExpress/performanceOrderList.html
View file @ aecfc8de
......@@ -35,6 +35,14 @@
<label>收货人姓名：</label>
<input type="text" name="expressContacts"/>
</li>
<!--<li>
<label>订单状态：</label>
<select name="orderStatus" th:with="type=${@dict.getType('zhengzai_order_status')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
th:value="${dict.dictValue}"></option>
</select>
</li>-->
<li>
<label>订单状态：</label>
<select name="orderStatus" th:with="type=${@dict.getType('zhengzai_order_status')}">
......@@ -45,9 +53,12 @@
</li>
<li>
<label>快递状态：</label>
<select name="expressStatus" th:with="type=${@dict.getType('zhengzai_express_status')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
th:value="${dict.dictValue}"></option>
<select name="expressStatus">
<option value="">所有</option>
<option value="1">未下单</option>
<option value="2">已下单</option>
<option value="50">已揽收</option>
<option value="80">已签收</option>
</select>
</li>
<li>
......@@ -291,6 +302,14 @@
}
function printExpress(orderExpressId) {
try{
var LODOP = getLodop();
if (LODOP == undefined) {
return false;
}
} catch (err) {
return false;
}
var data = '';
if (orderExpressId) {
var ids = [orderExpressId];
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performancesExpress/performancesList.html
View file @ aecfc8de
......@@ -241,6 +241,14 @@
}
function printExpress(performanceId) {
try{
var LODOP = getLodop();
if (LODOP == undefined) {
return false;
}
} catch (err) {
return false;
}
var data = '';
var ids = [performanceId];
data = {"ids": ids.join()};
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRefundPerformancesAdminServiceImpl.java
View file @ aecfc8de
......@@ -139,11 +139,11 @@ public class KylinRefundPerformancesAdminServiceImpl {
case "review":
batchUpdateStatus = batchStatus;
if (batchStatus == KylinTableStatusConst.STATUS_OPERATE_ADOPT44) { // 通过申请
paymentTypeAlipayArray = new Integer[]{KylinTableStatusConst.STATUS_APPLY};
paymentTypeAlipayArray = new Integer[]{KylinTableStatusConst.STATUS_APPLY, KylinTableStatusConst.STATUS_FINANCE_REJECT};
orderUpdateStatus = KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED;
}
if (batchStatus == KylinTableStatusConst.STATUS_OPERATE_REJECT33) { // 驳回申请
paymentTypeAlipayArray = new Integer[]{KylinTableStatusConst.STATUS_APPLY};
paymentTypeAlipayArray = new Integer[]{KylinTableStatusConst.STATUS_APPLY, KylinTableStatusConst.STATUS_FINANCE_REJECT};
orderUpdateStatus = KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT;
}
break;
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserServiceImpl.java
View file @ aecfc8de
......@@ -103,8 +103,9 @@ public class AdamUserServiceImpl implements IAdamUserService {
toMqSqls.add(SqlMapping.get("adam_user.add"));
initUserObjs.add(new Object[]{userInfoVo.getUid(), userInfoVo.getMobile(), userInfoVo.getState(), 0, now});
toMqSqls.add(SqlMapping.get("adam_user_info.add"));
initUserInfoObjs.add(new Object[]{userInfoVo.getQrCode(), userInfoVo.getUid()});
initUserInfoObjs.add(new Object[]{userInfoVo.getUid(), userInfoVo.getNickname(), userInfoVo.getQrCode()});
log.debug("#SQL.GET耗时:{}ms", System.currentTimeMillis() - s);
queueUtils.sendMsgByRedis(MQConst.AdamQueue.SQL_UREGISTER.getKey(),
SqlMapping.gets(toMqSqls, initUserObjs, initUserInfoObjs)
);
......@@ -131,6 +132,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
LinkedList<Object[]> initUserObjs = CollectionUtil.linkedListObjectArr(),
initUserInfoObjs = CollectionUtil.linkedListObjectArr(),
initThirdPartObjs = CollectionUtil.linkedListObjectArr();
if (StringUtils.isEmpty(uid)) {// 手机号未注册
userInfoVo = AdamUserInfoVo.getNew();
......@@ -151,10 +153,14 @@ public class AdamUserServiceImpl implements IAdamUserService {
toMqSqls.add(SqlMapping.get("adam_user.add"));
initUserObjs.add(new Object[]{userInfoVo.getUid(), userInfoVo.getMobile(), userInfoVo.getState(), now});
toMqSqls.add(SqlMapping.get("adam_user_info.add"));
initUserInfoObjs.add(new Object[]{userInfoVo.getUid(), userInfoVo.getNickname(), userInfoVo.getQrCode()});
} else {
s = System.currentTimeMillis();
userInfoVo = adamRdmService.getUserInfoVoByUid(uid);
log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
toMqSqls.add(SqlMapping.get("adam_user.add"));
toMqSqls.add(SqlMapping.get("adam_user_info.add"));
}
AdamThirdPartInfoVo thirdPartInfoVo = AdamThirdPartInfoVo.getNew();
......@@ -176,7 +182,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
s = System.currentTimeMillis();
queueUtils.sendMsgByRedis(MQConst.AdamQueue.SQL_UREGISTER.getKey(),
SqlMapping.gets(toMqSqls, initUserObjs, initThirdPartObjs)
SqlMapping.gets(toMqSqls, initUserObjs, initUserInfoObjs, initThirdPartObjs)
);
log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
} else {
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/sqlmap.properties
View file @ aecfc8de
......@@ -4,7 +4,7 @@ adam_user.edit.mobile=UPDATE adam_user SET mobile=?, updated_at=? WHERE `uid`=?
adam_user.close=UPDATE adam_user SET `state`=2, updated_at=?, closed_at=? WHERE `uid`=?
# ----------------------------------------------------
adam_user_info.add=INSERT INTO adam_user_info (`uid`, qr_code) VALUES (?,?)
adam_user_info.add=INSERT INTO adam_user_info (`uid`, nickname, qr_code) VALUES (?,?,?)
adam_user_info.edit=UPDATE adam_user_info SET nickname=?, sex=?, birthday=?, area=?, signature=?, avatar=?, background=?, tag_me=? WHERE uid=?
# ----------------------------------------------------
......
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