订单查看的状态条件修改
This commit is contained in:
1215525055@qq.com
parent
f4ffbbe0c0
commit
9a23c6442a
@ -1,5 +1,6 @@
|
||||
package cn.com.tenlion.aishop.controller.route.goodslog;
|
||||
|
||||
import cn.com.tenlion.aishop.properties.SystemApiPathProperties;
|
||||
import ink.wgink.common.base.DefaultBaseController;
|
||||
import ink.wgink.interfaces.consts.ISystemConstant;
|
||||
import cn.com.tenlion.aishop.service.goodslog.IGoodslogService;
|
||||
@ -24,6 +25,9 @@ import java.util.Map;
|
||||
@RequestMapping(ISystemConstant.ROUTE_PREFIX + "/goodslog")
|
||||
public class GoodslogRouteController extends DefaultBaseController {
|
||||
|
||||
@Autowired
|
||||
private SystemApiPathProperties systemApiPathProperties;
|
||||
|
||||
@GetMapping("save")
|
||||
public ModelAndView save() {
|
||||
return new ModelAndView("goodslog/save");
|
||||
@ -36,7 +40,9 @@ public class GoodslogRouteController extends DefaultBaseController {
|
||||
|
||||
@GetMapping("list")
|
||||
public ModelAndView list() {
|
||||
return new ModelAndView("goodslog/list");
|
||||
ModelAndView mv = new ModelAndView("goodslog/list");
|
||||
mv.addObject("pluginUrl", systemApiPathProperties.getOperatorPlugin());
|
||||
return mv;
|
||||
}
|
||||
|
||||
}
|
||||
@ -42,6 +42,8 @@ public class GoodsSimpleDTO {
|
||||
private String goodsType;
|
||||
@ApiModelProperty(name = "goodsTypeName", value = "软著平台类型名称")
|
||||
private String goodsTypeName;
|
||||
@ApiModelProperty(name = "goodsLeaderPhone", value = "著作权人手机号")
|
||||
private String goodsLeaderPhone;
|
||||
@ApiModelProperty(name = "goodsOpenPrice", value = "软著挂牌价格")
|
||||
private Double goodsOpenPrice;
|
||||
@ApiModelProperty(name = "goodsPrice", value = "软著出售价格")
|
||||
@ -57,6 +59,14 @@ public class GoodsSimpleDTO {
|
||||
@ApiModelProperty(name = "goodsFlag", value = "商品标签")
|
||||
private String goodsFlag;
|
||||
|
||||
public String getGoodsLeaderPhone() {
|
||||
return goodsLeaderPhone == null ? "" : goodsLeaderPhone.trim();
|
||||
}
|
||||
|
||||
public void setGoodsLeaderPhone(String goodsLeaderPhone) {
|
||||
this.goodsLeaderPhone = goodsLeaderPhone;
|
||||
}
|
||||
|
||||
public String getGoodsTypeName() {
|
||||
return goodsTypeName == null ? "" : goodsTypeName.trim();
|
||||
}
|
||||
|
||||
@ -30,9 +30,19 @@ public class GoodslogDTO {
|
||||
private String goodsId;
|
||||
@ApiModelProperty(name = "creator", value = "")
|
||||
private String creator;
|
||||
@ApiModelProperty(name = "creatorName", value = "")
|
||||
private String creatorName;
|
||||
@ApiModelProperty(name = "gmtCreate", value = "")
|
||||
private String gmtCreate;
|
||||
|
||||
public String getCreatorName() {
|
||||
return creatorName == null ? "" : creatorName.trim();
|
||||
}
|
||||
|
||||
public void setCreatorName(String creatorName) {
|
||||
this.creatorName = creatorName;
|
||||
}
|
||||
|
||||
public String getGoodslogId() {
|
||||
return goodslogId == null ? "" : goodslogId.trim();
|
||||
}
|
||||
|
||||
@ -156,15 +156,6 @@ public class OrderServiceImpl extends DefaultBaseService implements IOrderServic
|
||||
iGoodslogService.save(goodsLogVO);
|
||||
|
||||
|
||||
JSONArray phoneArray = new JSONArray();
|
||||
JSONObject obj = new JSONObject();
|
||||
obj.put("phone", goodsDTO.getGoodsLeaderPhone());
|
||||
phoneArray.add(obj);
|
||||
|
||||
Map<String, String> templateParams = new HashMap<>();
|
||||
templateParams.put("name", goodsDTO.getGoodsName());
|
||||
TenlionSMS.sendMessage(UUIDUtil.getUUID(), "M00014", templateParams, phoneArray);
|
||||
|
||||
|
||||
/* if (systemConfig.getSmsSwitch()) {
|
||||
iSmsService.sendContentDirectlyByPhone(goodsDTO.getGoodsLeaderPhone(), "您的著作权商品(" + goodsDTO.getGoodsName() + " " + goodsDTO.getGoodsVersion() + ") 已被用户下单购买");
|
||||
@ -354,6 +345,14 @@ public class OrderServiceImpl extends DefaultBaseService implements IOrderServic
|
||||
payVO.setAccountMoney(PayUtil.buiderMoney(orderDTO.getPayMoney()));
|
||||
payVO.setDescription("购买付款." + simpleDTO.getGoodsName());
|
||||
remoteService.savePayOut(payVO);
|
||||
// 发送短信
|
||||
JSONArray phoneArray = new JSONArray();
|
||||
JSONObject obj = new JSONObject();
|
||||
obj.put("phone", simpleDTO.getGoodsLeaderPhone());
|
||||
phoneArray.add(obj);
|
||||
Map<String, String> templateParams = new HashMap<>();
|
||||
templateParams.put("name", simpleDTO.getGoodsName());
|
||||
TenlionSMS.sendMessage(UUIDUtil.getUUID(), "M00014", templateParams, phoneArray);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -11,6 +11,7 @@
|
||||
<result column="goodslog_time" property="goodslogTime"/>
|
||||
<result column="goods_id" property="goodsId"/>
|
||||
<result column="creator" property="creator"/>
|
||||
<result column="creator_name" property="creatorName"/>
|
||||
<result column="gmt_create" property="gmtCreate"/>
|
||||
</resultMap>
|
||||
|
||||
@ -178,9 +179,14 @@
|
||||
t1.goodslog_time,
|
||||
t1.goods_id,
|
||||
t1.creator,
|
||||
t1.gmt_create
|
||||
t1.gmt_create,
|
||||
t3.user_username AS creator_name
|
||||
FROM
|
||||
shop_goodslog t1
|
||||
LEFT JOIN
|
||||
user t3
|
||||
ON
|
||||
t1.creator = t3.user_id
|
||||
WHERE
|
||||
t1.goods_id = #{goodsId}
|
||||
ORDER BY
|
||||
|
||||
@ -12,6 +12,7 @@
|
||||
<result column="goods_get_time" property="goodsGetTime"/>
|
||||
<result column="goods_develop" property="goodsDevelop"/>
|
||||
<result column="goods_photo" property="goodsPhoto"/>
|
||||
<result column="goods_leader_phone" property="goodsLeaderPhone"/>
|
||||
<result column="goods_get_type" property="goodsGetType"/>
|
||||
<result column="goods_description" property="goodsDescription"/>
|
||||
<result column="goods_type" property="goodsType"/>
|
||||
@ -133,6 +134,7 @@
|
||||
t1.goods_version,
|
||||
t1.goods_get_time,
|
||||
t1.goods_develop,
|
||||
t1.goods_leader_phone,
|
||||
t1.goods_photo,
|
||||
t1.goods_get_type,
|
||||
t1.goods_description,
|
||||
@ -163,6 +165,7 @@
|
||||
t1.goods_version,
|
||||
t1.goods_get_time,
|
||||
t1.goods_develop,
|
||||
t1.goods_leader_phone,
|
||||
t1.goods_photo,
|
||||
t1.goods_get_type,
|
||||
t1.goods_description,
|
||||
@ -196,6 +199,7 @@
|
||||
t1.goods_version,
|
||||
t1.goods_get_time,
|
||||
t1.goods_develop,
|
||||
t1.goods_leader_phone,
|
||||
t1.goods_photo,
|
||||
t1.goods_get_type,
|
||||
t1.goods_description,
|
||||
|
||||
@ -32,11 +32,13 @@
|
||||
<span v-if="data.goodslogStatus == '0' && data.goodslogContent == '' " style="color: red">审核未通过</span>
|
||||
<span v-if="data.goodslogStatus == '0' && data.goodslogContent != '' " style="color: red"></br>审核未通过</span>
|
||||
</p>
|
||||
<p>
|
||||
{{ data.goodslogTime}}
|
||||
<p @click="handleLogContentClick2(data, $event)">
|
||||
<i class="fa fa-lg fa-user"></i> {{ data.creatorName}}
|
||||
</p>
|
||||
<p @click="handleLogContentClick2(data, $event)">
|
||||
<i class="fa fa-lg fa-clock-o "></i> {{ data.goodslogTime}}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
@ -72,6 +74,9 @@
|
||||
},
|
||||
methods: {
|
||||
/* 点击日志内容事件 */
|
||||
handleLogContentClick2(data) {
|
||||
event.stopPropagation(); // 阻止事件冒泡
|
||||
},
|
||||
handleLogContentClick(data) {
|
||||
// 这里可以获取到当前点击的 data 对象
|
||||
console.log('点击的日志数据:', data);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user