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

Skip to content

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

Merge branch 'hjc_now' into dev_221101ZGB01

parents e2bcff6c cf26d87c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 176 additions and 141 deletions
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinOrderSkuVo.java
View file @ 4fcb6947
...@@ -3,6 +3,7 @@ package com.liquidnet.service.goblin.dto.vo; ...@@ -3,6 +3,7 @@ package com.liquidnet.service.goblin.dto.vo;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.liquidnet.commons.lang.util.DateUtil; import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.goblin.entity.GoblinOrderSku; import com.liquidnet.service.goblin.entity.GoblinOrderSku;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -26,6 +27,7 @@ import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS; ...@@ -26,6 +27,7 @@ import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@JsonIgnoreProperties(ignoreUnknown = true)
public class GoblinOrderSkuVo implements Serializable, Cloneable { public class GoblinOrderSkuVo implements Serializable, Cloneable {
@ApiModelProperty(value = "订单sku_id") @ApiModelProperty(value = "订单sku_id")
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/placingOrder/activityList.html
View file @ 4fcb6947
...@@ -98,9 +98,9 @@ ...@@ -98,9 +98,9 @@
<a class="btn btn-success" id="addActivity" th:onclick="$.operate.addTab()"> <a class="btn btn-success" id="addActivity" th:onclick="$.operate.addTab()">
<i class="fa fa-plus"></i> 新增活动 <i class="fa fa-plus"></i> 新增活动
</a> </a>
<a class="btn btn-warning" id="button-open-11"> <!-- <a class="btn btn-warning" id="button-open-11">
<i class="fa fa-download"></i> 导出Excel <i class="fa fa-download"></i> 导出Excel
</a> </a> -->
</div> </div>
</div> </div>
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/placingOrder/activityStoreList.html
View file @ 4fcb6947
...@@ -73,14 +73,14 @@ ...@@ -73,14 +73,14 @@
<body class="tagStore"> <body class="tagStore">
<div class="container-div"> <div class="container-div">
<div class="row"> <div class="row">
<div class="btn-group-sm" id="toolbar"> <!-- <div class="btn-group-sm" id="toolbar">
<div> <div>
<a class="btn btn-warning" id="button-open-11"> <a class="btn btn-warning" id="button-open-11">
<i class="fa fa-download"></i> 导出Excel <i class="fa fa-download"></i> 导出Excel
</a> </a>
</div> </div>
</div> </div> -->
<div class="col-sm-12 search-collapse"> <!-- <div class="col-sm-12 search-collapse">
<form id="role-form"> <form id="role-form">
<div class="select-list"> <div class="select-list">
<ul> <ul>
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
</ul> </ul>
</div> </div>
</form> </form>
</div> </div> -->
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
</div> </div>
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
data: res.data, data: res.data,
// onLoadSuccess: onLoadSuccess, // onLoadSuccess: onLoadSuccess,
showSearch: false, showSearch: false,
showRefresh: true, showRefresh: false,
showColumns: false, showColumns: false,
showToggle: false, showToggle: false,
columns: [ columns: [
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/placingOrder/addNewActivity.html
View file @ 4fcb6947
...@@ -232,6 +232,8 @@ ...@@ -232,6 +232,8 @@
$(this).fileinput("upload"); $(this).fileinput("upload");
}) })
.on("fileuploaded", function (event, data) { //上传回调事件 .on("fileuploaded", function (event, data) { //上传回调事件
console.log(event, data)
if (data.response.code == 1) return layer.msg(data.response.message);
let showPicture = 'https://img.zhengzai.tv/' + data.response.data.ossPath; let showPicture = 'https://img.zhengzai.tv/' + data.response.data.ossPath;
$("#viewImg").attr('src', showPicture) $("#viewImg").attr('src', showPicture)
}) })
...@@ -362,7 +364,7 @@ ...@@ -362,7 +364,7 @@
endTime: $("#endTime").val(), endTime: $("#endTime").val(),
startTime: $("#startTime").val(), startTime: $("#startTime").val(),
name: $("#selectShow").val(), name: $("#selectShow").val(),
performanceId: $("#selectShow").attr('data-id'), performanceId: $("#selectShow").attr('data-id').split(',')[$("#selectShow").attr('data-id').split(',').length - 1],
performanceImg: $("#viewImg").attr('src') performanceImg: $("#viewImg").attr('src')
} // endTime } // endTime
if (marketId) { if (marketId) {
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/placingOrder/setGoodsRole.html
View file @ 4fcb6947
...@@ -128,20 +128,20 @@ ...@@ -128,20 +128,20 @@
align: 'center' align: 'center'
}, },
{ {
field: 'buyLimit', field: 'stockMarketing',
// title: '库存限量<a onclick="setPrice(2)">批量</a>', // title: '库存限量<a onclick="setPrice(2)">批量</a>',
title: '库存限量', title: '库存限量',
width: '150', width: '150',
align: 'center', align: 'center',
formatter: function (value, row, index) { // formatter: function (value, row, index) {
let str = ''; // let str = '';
if (value == 0) { // if (value == 0) {
str = '无限量'; // str = '无限量';
} else { // } else {
str = value; // str = value;
} // }
return str // return str
} // }
}, },
{ {
field: 'buyLimit', field: 'buyLimit',
...@@ -165,20 +165,20 @@ ...@@ -165,20 +165,20 @@
if (value == 0) { if (value == 0) {
return `<div style="display:flex;"> return `<div style="display:flex;">
<label style="margin-right:12px;"> <label style="margin-right:12px;">
<input type="radio" checked value="1" id="optionsRadios1" name="optionsRadios${index}"><span>全部用户</span></label> <input disabled type="radio" checked value="1" id="optionsRadios1" name="optionsRadios${index}"><span>全部用户</span></label>
<label style="margin-right:12px;"> <label style="margin-right:12px;">
<input type="radio" value="2" id="optionsRadios1" name="optionsRadios${index}"><span>仅支持会员购买</span></label> <input disabled type="radio" value="2" id="optionsRadios1" name="optionsRadios${index}"><span>仅支持会员购买</span></label>
<label style="margin-right:12px;"> <label style="margin-right:12px;">
<input type="radio" value="3" id="optionsRadios1" name="optionsRadios${index}"><span>指定用户购买</span></label> <input disabled type="radio" value="3" id="optionsRadios1" name="optionsRadios${index}"><span>指定用户购买</span></label>
</div>` </div>`
} else { } else {
return `<div style="display:flex;"> return `<div style="display:flex;">
<label style="margin-right:12px;"> <label style="margin-right:12px;">
<input type="radio" value="1" id="optionsRadios1" name="optionsRadios${index}"><span>全部用户</span></label> <input disabled type="radio" value="1" id="optionsRadios1" name="optionsRadios${index}"><span>全部用户</span></label>
<label style="margin-right:12px;"> <label style="margin-right:12px;">
<input type="radio" checked value="2" id="optionsRadios1" name="optionsRadios${index}"><span>仅支持会员购买</span></label> <input disabled type="radio" checked value="2" id="optionsRadios1" name="optionsRadios${index}"><span>仅支持会员购买</span></label>
<label style="margin-right:12px;"> <label style="margin-right:12px;">
<input type="radio" value="3" id="optionsRadios1" name="optionsRadios${index}"><span>指定用户购买</span></label> <input disabled type="radio" value="3" id="optionsRadios1" name="optionsRadios${index}"><span>指定用户购买</span></label>
</div>` </div>`
} }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/impl/GoblinZhengzaiMarketServiceImpl.java
View file @ 4fcb6947
...@@ -141,6 +141,8 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer ...@@ -141,6 +141,8 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
BeanUtils.copyProperties(selfMarketing, vo); BeanUtils.copyProperties(selfMarketing, vo);
vo.setStartTime(st); vo.setStartTime(st);
vo.setEndTime(et); vo.setEndTime(et);
vo.setEndTime(et);
vo.setStatus(0);
vo.setPerformanceId(performanceId); vo.setPerformanceId(performanceId);
vo.setPerformanceImg(img); vo.setPerformanceImg(img);
vo.setCreatedAt(DateUtil.Formatter.yyyyMMddHHmmss.format(selfMarketing.getCreatedAt())); vo.setCreatedAt(DateUtil.Formatter.yyyyMMddHHmmss.format(selfMarketing.getCreatedAt()));
......
liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinSelfMarketingMapper.xml
View file @ 4fcb6947
...@@ -48,7 +48,7 @@ select b.store_id, ...@@ -48,7 +48,7 @@ select b.store_id,
IFNull(count(distinct d.sku_id), 0) as 'sku_count' IFNull(count(distinct d.sku_id), 0) as 'sku_count'
from goblin_self_marketing as a from goblin_self_marketing as a
inner join goblin_marketing_zhengzai_relation as b on a.self_market_id = b.self_market_id inner join goblin_marketing_zhengzai_relation as b on a.self_market_id = b.self_market_id
inner join goblin_store_info as c on c.store_id = b.store_id inner join goblin_store_info as c on c.store_id = b.store_id and b.del_tag = 0
left join goblin_marketing_zhengzai as d on d.store_id = b.store_id and d.self_market_id = b.self_market_id left join goblin_marketing_zhengzai as d on d.store_id = b.store_id and d.self_market_id = b.self_market_id
where a.self_market_id = #{marketId} and b.del_tag = 0 where a.self_market_id = #{marketId} and b.del_tag = 0
GROUP BY b.store_id ORDER BY b.created_at asc GROUP BY b.store_id ORDER BY b.created_at asc
...@@ -73,7 +73,6 @@ GROUP BY b.store_id ORDER BY b.created_at asc ...@@ -73,7 +73,6 @@ GROUP BY b.store_id ORDER BY b.created_at asc
<where> <where>
gsm.del_flag = 0 gsm.del_flag = 0
<if test="purchaseName != null and purchaseName!=''">and gsm.name like concat('%', #{purchaseName}, '%') <if test="purchaseName != null and purchaseName!=''">and gsm.name like concat('%', #{purchaseName}, '%')
'%'
</if> </if>
<if test="ct != null and ct!=''">and gsm.created_at = #{ct}</if> <if test="ct != null and ct!=''">and gsm.created_at = #{ct}</if>
<if test="st != null and et != null and st != '' and et != ''">and and gsm.start_time <![CDATA[ >= ]]> #{st} <if test="st != null and et != null and st != '' and et != ''">and and gsm.start_time <![CDATA[ >= ]]> #{st}
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinStoreZhengzaiServiceImpl.java
View file @ 4fcb6947
...@@ -73,7 +73,7 @@ public class GoblinStoreZhengzaiServiceImpl implements IGoblinStoreZhengzaiServi ...@@ -73,7 +73,7 @@ public class GoblinStoreZhengzaiServiceImpl implements IGoblinStoreZhengzaiServi
return ResponseDto.failure("店铺不存在"); return ResponseDto.failure("店铺不存在");
} }
GoblinSelfMarketingVo marketingVo = redisUtils.getSelfMarket(marketId); GoblinSelfMarketingVo marketingVo = redisUtils.getSelfMarket(marketId);
if (marketingVo.getStatus() == 7) { if (marketingVo.getStatus()!=null && marketingVo.getStatus() == 7) {
return ResponseDto.failure("活动已停用"); return ResponseDto.failure("活动已停用");
} }
//todo //todo
......
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/dragon/channel/wepay/resp/AliPayRefundReturnCallBackDto.java
View file @ 4fcb6947
package com.liquidnet.service.dragon.channel.wepay.resp; package com.liquidnet.service.dragon.channel.wepay.resp;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.liquidnet.service.goblin.dto.vo.GoblinOrderSkuVo;
import lombok.Data; import lombok.Data;
@Data @Data
public class AliPayRefundReturnCallBackDto { public class AliPayRefundReturnCallBackDto implements Cloneable{
@JsonProperty("gmt_create") @JsonProperty("gmt_create")
private String gmtCreate; private String gmtCreate;
@JsonProperty("charset") @JsonProperty("charset")
...@@ -54,4 +55,13 @@ public class AliPayRefundReturnCallBackDto { ...@@ -54,4 +55,13 @@ public class AliPayRefundReturnCallBackDto {
@JsonProperty("seller_id") @JsonProperty("seller_id")
private String sellerId; private String sellerId;
private static final AliPayRefundReturnCallBackDto obj = new AliPayRefundReturnCallBackDto();
public static AliPayRefundReturnCallBackDto getNew() {
try {
return (AliPayRefundReturnCallBackDto) obj.clone();
} catch (CloneNotSupportedException e) {
return new AliPayRefundReturnCallBackDto();
}
}
} }
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/dragon/service/impl/DragonOrderRefundsServiceImpl.java
View file @ 4fcb6947
...@@ -608,6 +608,14 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService ...@@ -608,6 +608,14 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
contentDto.setRequest(JSON.toJSONString(response.getParams())); contentDto.setRequest(JSON.toJSONString(response.getParams()));
contentDto.setResponse(response.getBody()); contentDto.setResponse(response.getBody());
channelDto.setContent(contentDto); channelDto.setContent(contentDto);
if(DragonConstant.REFUND_TYPE_MICROPAY_ALIPAY.equals(paymentType) && response.getFundChange().equals("Y")) {
AliPayRefundReturnCallBackDto map = AliPayRefundReturnCallBackDto.getNew();
map.setOutBizNo(response.getOutTradeNo());
map.setTradeNo(response.getTradeNo());
map.setOutTradeNo(response.getOutTradeNo());
map.setGmtRefund(DateUtil.format(response.getGmtRefundPay(), DateUtil.Formatter.yyyyMMddHHmmss));
aliPayRefundCallBack(JSON.toJSONString(map));
}
return channelDto; return channelDto;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
......
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