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

Skip to content

L
liquidnet-bus-v1
Commit 7ed70383 authored by 刘喆's avatar 刘喆
Browse files
Options

Merge branch 'pre' into 'master' 

Pre

See merge request !60
parents 7add7218 554ddef7
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 14 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/order/orderList/detail.html
View file @ 7ed70383
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('会员订单详情')" />
<style type="text/css">.user-info-head{position:relative;display:inline-block;}.user-info-head:hover:after{content:'\f030';position:absolute;left:0;right:0;top:0;bottom:0;color:#eee;background:rgba(0,0,0,0.5);font-family:FontAwesome;font-size:24px;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;cursor:pointer;line-height:110px;border-radius:50%;}</style>
......@@ -124,6 +124,7 @@
<a class="btn btn-primary" style="margin-left: 15px;" href="#member-refund-form" data-toggle="modal" shiro:hasPermission="adam:order:orderlist:refund" th:if="${orderDetailsVo.adamMemberOrderVo.state == 1 && orderDetailsVo.adamUserMemberVo.state == 1 && orderDetailsVo.adamMemberOrderVo.mode == 0}">
申请退款
</a>
</div>
<div id="member-refund-form" class="modal fade" aria-hidden="true">
......@@ -180,7 +181,7 @@
</section>
<th:block th:include="include :: footer" />
<script>
<script th:inline="javascript">
var pricePaid = [[${orderDetailsVo.adamMemberOrderVo.pricePaid}]];
$("#form-member-order-refund").validate({
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/order/orderList/order.html
View file @ 7ed70383
......@@ -82,7 +82,7 @@
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var detailFlag = [[${@permission.hasPermi('adam:order:orderList')}]];
var detailFlag = [[${@permission.hasPermi('adam:order:orderlist:detail')}]];
var prefix = ctx + "adam/order/orderList";
var orderStatusDic = [[${@dict.getType('zhengzai_member_order_status')}]];
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserInfoServiceImpl.java
View file @ 7ed70383
......@@ -122,7 +122,8 @@ public class AdamUserInfoServiceImpl implements IAdamUserInfoService {
String sexStr = JsonUtils.toJson(existUserInfoVo.getSex());
String tagMeStr = JsonUtils.toJson(tagMe);
if (syncChimeFlg || null == beforeSex || !parameter.getSex().getVal().equals(beforeSex.getVal())) {// 同步`service-chime`
if (syncChimeFlg || null == beforeSex || (null != parameter.getSex() && !parameter.getSex().getVal().equals(beforeSex.getVal()))) {
// 同步`service-chime`
ResponseDto<String> chimeRegisterRstFlg = null;
try {
chimeRegisterRstFlg = feignAdamChimeClient.registerForUser(
......
liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/util/RedisDataUtils.java
View file @ 7ed70383
......@@ -41,24 +41,24 @@ public class RedisDataUtils {
if (obj == null) {
//降级
// userDto = new ArrayList();
ResponseDto<Object> responseDto = feignPlatformCandyDemoteClient.queryForUserCouponBasicDto(uid);
if (responseDto.isSuccess()) {
userDto = (List<CandyUserCouponBasicDto>) responseDto.getData();
} else {
// ResponseDto<Object> responseDto = feignPlatformCandyDemoteClient.queryForUserCouponBasicDto(uid);
// if (responseDto.isSuccess()) {
// userDto = (List<CandyUserCouponBasicDto>) responseDto.getData();
// } else {
userDto = ObjectUtil.getCandyUserCouponBasicDtoArrayList();
}
// }
} else {
userDto = (List<CandyUserCouponBasicDto>) obj;
}
if (obj2 == null) {
//降级
ResponseDto<Object> responseDto = feignPlatformCandyDemoteClient.queryForCommonCouponBasicDto(DateUtil.Formatter.yyyyMMddHHmmss.format(userCreateTime));
if (responseDto.isSuccess()) {
pubDto = (List<CandyCommonCouponBasicDto>) responseDto.getData();
} else {
// ResponseDto<Object> responseDto = feignPlatformCandyDemoteClient.queryForCommonCouponBasicDto(DateUtil.Formatter.yyyyMMddHHmmss.format(userCreateTime));
// if (responseDto.isSuccess()) {
// pubDto = (List<CandyCommonCouponBasicDto>) responseDto.getData();
// } else {
pubDto = ObjectUtil.getCandyCommonCouponBasicDtoArrayList();
}
// }
} else {
pubDto = (List<CandyCommonCouponBasicDto>) obj2;
}
......
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