Skip to content

C
chinafrica
提交 b303f62e authored 作者: luojie's avatar luojie
浏览文件
操作

优化代购信息

上级 66f27f33
显示空白字符变更
内嵌 并排
正在显示 包含 50 行增加 和 39 行删除
platform-admin/src/main/java/com/platform/service/impl/TbCfItemOrderRServiceImpl.java
浏览文件 @ b303f62e
...@@ -75,6 +75,7 @@ public class TbCfItemOrderRServiceImpl implements TbCfItemOrderRService { ...@@ -75,6 +75,7 @@ public class TbCfItemOrderRServiceImpl implements TbCfItemOrderRService {
@Override @Override
public int updateExpressStatusDelivery(String[] sids) { public int updateExpressStatusDelivery(String[] sids) {
return tbCfItemOrderRDao.updateExpressStatusDelivery(sids); return tbCfItemOrderRDao.updateExpressStatusDelivery(sids);
} }
......
platform-admin/src/main/java/com/platform/service/impl/TbCfOrderServiceImpl.java
浏览文件 @ b303f62e
...@@ -90,13 +90,13 @@ public class TbCfOrderServiceImpl implements TbCfOrderService { ...@@ -90,13 +90,13 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
//tbCfPlatformOrder 有relativeId 则就是修改 //tbCfPlatformOrder 有relativeId 则就是修改
int res=0; int res=0;
if(StringUtils.isNotEmpty(tbCfPlatformOrder.getRelativeId())) { if(StringUtils.isNotEmpty(tbCfPlatformOrder.getRelativeId())) {
tbCfPlatformOrder.setOrdersId(tbCfPlatformOrder.getOrdersId()); tbCfPlatformOrder.setRelativeId(tbCfPlatformOrder.getRelativeId());
String userId=ShiroUtils.getUserId(); String userId=ShiroUtils.getUserId();
tbCfPlatformOrder.setUserId(userId); tbCfPlatformOrder.setUserId(userId);
tbCfPlatformOrder.setUserName(sysUserDao.queryById(userId)); tbCfPlatformOrder.setUserName(sysUserDao.queryById(userId));
res = tbCfPlatformOrderDao.updates(tbCfPlatformOrder); res = tbCfPlatformOrderDao.updates(tbCfPlatformOrder);
} else { } else {
tbCfPlatformOrder.setRelativeId(IdUtil.createIdbyUUID()); tbCfPlatformOrder.setRelativeId(tbCfPlatformOrder.getOrdersId());
tbCfPlatformOrder.setOrderId(tbCfItemOrderRDao.getOrderId(tbCfPlatformOrder.getOrdersId())); tbCfPlatformOrder.setOrderId(tbCfItemOrderRDao.getOrderId(tbCfPlatformOrder.getOrdersId()));
tbCfPlatformOrder.setCreateTime(new Date()); tbCfPlatformOrder.setCreateTime(new Date());
String userId=ShiroUtils.getUserId(); String userId=ShiroUtils.getUserId();
...@@ -111,6 +111,10 @@ public class TbCfOrderServiceImpl implements TbCfOrderService { ...@@ -111,6 +111,10 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
tbCfItemOrderREntity.setOrderItemId(tbCfPlatformOrder.getOrdersId()); tbCfItemOrderREntity.setOrderItemId(tbCfPlatformOrder.getOrdersId());
tbCfItemOrderREntity.setOrderStatus(OrderStatusEnum.SHIPPED.getValue()); tbCfItemOrderREntity.setOrderStatus(OrderStatusEnum.SHIPPED.getValue());
tbCfItemOrderRDao.update(tbCfItemOrderREntity); tbCfItemOrderRDao.update(tbCfItemOrderREntity);
TbCfOrderEntity tbCfOrderEntity = new TbCfOrderEntity();
tbCfOrderEntity.setOrderId(tbCfOrderEntity.getOrderId());
tbCfOrderEntity.setOrderStatus(OrderStatusEnum.SHIPPED.getValue());
tbCfOrderDao.update(tbCfOrderEntity);
//更新发货时间，如果原值为空就更新，否则保留原值 //更新发货时间，如果原值为空就更新，否则保留原值
TbCfItemOrderREntity tbCfItemOrderREntity2 = new TbCfItemOrderREntity(); TbCfItemOrderREntity tbCfItemOrderREntity2 = new TbCfItemOrderREntity();
tbCfItemOrderREntity2.setOrderItemId(tbCfPlatformOrder.getOrdersId()); tbCfItemOrderREntity2.setOrderItemId(tbCfPlatformOrder.getOrdersId());
......
platform-admin/src/main/resources/caffeine.properties
浏览文件 @ b303f62e
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
# Caffeine configuration # Caffeine configuration
# [name] = size, xxxx[s|m|h|d] # [name] = size, xxxx[s|m|h|d]
######################################### #########################################
default=1000, 30m default=1000, 1440m
sysCache=1000, 60m sysCache=1000, 60m
\ No newline at end of file
platform-admin/src/main/resources/com/platform/dao/TbCfItemOrderRDao.xml
浏览文件 @ b303f62e
...@@ -133,9 +133,9 @@ ...@@ -133,9 +133,9 @@
<!--根据快递单号id，修改物流状态为已入中国仓库 --> <!--根据快递单号id，修改物流状态为已入中国仓库 -->
<update id="updateExpressStatus"> <update id="updateExpressStatus">
UPDATE tb_cf_order o,tb_cf_platform_order p, UPDATE tb_cf_order o,tb_cf_platform_order p,tb_cf_item_order_r i
SET i.delivery_flag = 20 SET i.delivery_flag = 20
WHERE o.order_id=p.order_id and i.delivery_flag=10 and p.p_express_number in WHERE o.order_id=p.order_id and i.order_id=o.order_id and i.delivery_flag=10 and p.p_express_number in
<foreach collection="array" item="sids" open="(" separator="," close=")"> <foreach collection="array" item="sids" open="(" separator="," close=")">
#{sids} #{sids}
</foreach> </foreach>
...@@ -143,9 +143,9 @@ ...@@ -143,9 +143,9 @@
<!--根据快递单号id，修改物流状态为已入非洲仓库 --> <!--根据快递单号id，修改物流状态为已入非洲仓库 -->
<update id="updateExpressStatuss"> <update id="updateExpressStatuss">
update tb_cf_order o,tb_cf_platform_order p UPDATE tb_cf_order o,tb_cf_platform_order p,tb_cf_item_order_r i
set i.delivery_flag = 40 SET i.delivery_flag = 40
where o.order_id=p.order_id and i.delivery_flag = 20 and p.p_express_number in WHERE o.order_id=p.order_id and i.order_id=o.order_id and i.delivery_flag=20 and p.p_express_number in
<foreach collection="array" item="sids" open="(" separator="," close=")"> <foreach collection="array" item="sids" open="(" separator="," close=")">
#{sids} #{sids}
</foreach> </foreach>
...@@ -153,9 +153,9 @@ ...@@ -153,9 +153,9 @@
<!--根据快递单号id，修改物流状态为已签收 --> <!--根据快递单号id，修改物流状态为已签收 -->
<update id="updateExpressStatusDelivery"> <update id="updateExpressStatusDelivery">
update tb_cf_order o,tb_cf_platform_order p UPDATE tb_cf_order o,tb_cf_platform_order p,tb_cf_item_order_r i
set i.delivery_flag = 50 SET i.delivery_flag = 50,o.order_status=50
where o.order_id=p.order_id and p.p_express_number in WHERE o.order_id=p.order_id and i.order_id=o.order_id and i.delivery_flag=40 and p.p_express_number in
<foreach collection="array" item="sids" open="(" separator="," close=")"> <foreach collection="array" item="sids" open="(" separator="," close=")">
#{sids} #{sids}
</foreach> </foreach>
......
platform-admin/src/main/resources/com/platform/dao/TbCfPlatformOrderDao.xml
浏览文件 @ b303f62e
...@@ -138,8 +138,6 @@ ...@@ -138,8 +138,6 @@
<if test="platformName != null">p.platform_name = #{platformName}, </if> <if test="platformName != null">p.platform_name = #{platformName}, </if>
<if test="platformCode != null">p.platform_code = #{platformCode}, </if> <if test="platformCode != null">p.platform_code = #{platformCode}, </if>
<if test="pDeliveryAddress != null">p.p_delivery_address = #{pDeliveryAddress}, </if> <if test="pDeliveryAddress != null">p.p_delivery_address = #{pDeliveryAddress}, </if>
<if test="userName != null">p.user_name = #{userName}, </if>
<if test="userId != null">p.user_id = #{userId}, </if>
<if test="createTime != null">p.create_time = #{createTime}, </if> <if test="createTime != null">p.create_time = #{createTime}, </if>
<if test="realityPay != null">p.reality_pay = #{realityPay}, </if> <if test="realityPay != null">p.reality_pay = #{realityPay}, </if>
<if test="pExpressNumber != null">p.p_express_number = #{pExpressNumber},</if> <if test="pExpressNumber != null">p.p_express_number = #{pExpressNumber},</if>
...@@ -179,7 +177,7 @@ ...@@ -179,7 +177,7 @@
left join sys_user u on p.user_id=u.user_id left join sys_user u on p.user_id=u.user_id
left join tb_cf_express_template e on e.template_id=p.descripition_id left join tb_cf_express_template e on e.template_id=p.descripition_id
left join tb_cf_item_order_r i on i.order_id=o.order_id left join tb_cf_item_order_r i on i.order_id=o.order_id
where i.order_item_id =#{ordersId}; where i.order_item_id =#{ordersId} and p.relative_id=#{ordersId};
</select> </select>
</mapper> </mapper>
\ No newline at end of file
platform-admin/src/main/resources/dev/platform.properties
浏览文件 @ b303f62e
...@@ -2,9 +2,13 @@ ...@@ -2,9 +2,13 @@
#jdbc.username=root #jdbc.username=root
#jdbc.password=root #jdbc.password=root
jdbc.url=jdbc:mysql://47.106.242.175:3306/chinafrica?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8 #jdbc.url=jdbc:mysql://47.106.242.175:3306/chinafrica?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8
jdbc.username=root #jdbc.username=root
jdbc.password=diaoyun666 #jdbc.password=diaoyun666
jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
jdbc.username: root
jdbc.password: Diaoyunnuli.8
jdbc.initialSize=5 jdbc.initialSize=5
jdbc.maxActive=30 jdbc.maxActive=30
......
platform-admin/src/main/resources/prod/platform.properties
浏览文件 @ b303f62e
...@@ -2,9 +2,14 @@ ...@@ -2,9 +2,14 @@
#jdbc.username=root #jdbc.username=root
#jdbc.password=root #jdbc.password=root
jdbc.url=jdbc:mysql://47.106.242.175:3306/platform?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8 #jdbc.url=jdbc:mysql://47.106.242.175:3306/platform?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8
jdbc.username=root #jdbc.username=root
jdbc.password=diaoyun666 #jdbc.password=diaoyun666
jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
jdbc.username: root
jdbc.password: Diaoyunnuli.8
jdbc.initialSize=5 jdbc.initialSize=5
jdbc.maxActive=30 jdbc.maxActive=30
......
platform-admin/src/main/webapp/WEB-INF/page/sys/tbcfcoupon.html
浏览文件 @ b303f62e
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<i-button @click="reloadSearch">重置</i-button> <i-button @click="reloadSearch">重置</i-button>
</div> </div>
<div class="buttons-group"> <div class="buttons-group">
<!--<i-button type="info" @click="insertcoupon">新增优惠券类型</i-button>--> <!-- <i-button type="info" @click="insertcoupon">新增优惠券类型</i-button>-->
<!-- <i-button type="info" @click="showTake">查看领取情况</i-button>--> <!-- <i-button type="info" @click="showTake">查看领取情况</i-button>-->
<i-button type="info" @click="showToi">查看发放情况</i-button> <i-button type="info" @click="showToi">查看发放情况</i-button>
<!--<i-button type="info" @click="showUse"><i class="fa fa-plus"></i>&nbsp;查看使用情况</i-button>--> <!--<i-button type="info" @click="showUse"><i class="fa fa-plus"></i>&nbsp;查看使用情况</i-button>-->
......
platform-admin/src/main/webapp/js/sys/tbcfcoupon.js
浏览文件 @ b303f62e
...@@ -3,7 +3,7 @@ $(function () { ...@@ -3,7 +3,7 @@ $(function () {
url: '../tbcfcoupon/list', url: '../tbcfcoupon/list',
colModel: [ colModel: [
{label: 'couponId', name: 'couponId', index: 'coupon_id', key: true, hidden: true}, {label: 'couponId', name: 'couponId', index: 'coupon_id', key: true, hidden: true},
{label: '优惠券类型 ', name: 'couponCategoryId', index: 'couponCategory_id', width: 60,formatter: "select", editoptions:{value:"10:购物返券;20:注册返券;30:邀请返券;40:用户领券"}}, {label: '优惠券类型 ', name: 'couponCategoryId', index: 'coupon_category_d', width: 60,formatter: "select", editoptions:{value:"10:购物返券;20:注册返券;30:邀请返券;40:用户领券"}},
{label: '可用于类目', name: 'couponUse', index: 'coupon_use', width: 80, hidden: true}, {label: '可用于类目', name: 'couponUse', index: 'coupon_use', width: 80, hidden: true},
{label: '优惠券标题', name: 'couponTitle', index: 'coupon_title', width: 80}, {label: '优惠券标题', name: 'couponTitle', index: 'coupon_title', width: 80},
{label: '优惠券图片地址', name: 'couponIcon', index: 'coupon_icon', width: 70, hidden: true}, {label: '优惠券图片地址', name: 'couponIcon', index: 'coupon_icon', width: 70, hidden: true},
...@@ -25,6 +25,15 @@ $(function () { ...@@ -25,6 +25,15 @@ $(function () {
{label: '是否为注册即送优惠券', name: 'couponVaild', index: 'coupon_vaild', width: 90,formatter:validFormat}] {label: '是否为注册即送优惠券', name: 'couponVaild', index: 'coupon_vaild', width: 90,formatter:validFormat}]
}); });
}); });
$.get('../tbcfcoupon/queryAllCoupon',function (res) {
vm.Coupon=JSON.parse(res).list;
console.log(res.list)
})
$.get('../tbcfcouponcategory/queryAll',function (res1) {
console.log(res1.list)
vm.CouponCategory=JSON.parse(res1).list;
})
$(function () { $(function () {
$("#jqGrid1").Grid({ $("#jqGrid1").Grid({
url: '../tbcfcouponIssue/list', url: '../tbcfcouponIssue/list',
...@@ -298,11 +307,11 @@ let vm = new Vue({ ...@@ -298,11 +307,11 @@ let vm = new Vue({
this.showCategory=false this.showCategory=false
vm.title="新增优惠券类型"; vm.title="新增优惠券类型";
vm.tbCfCouponCategory={}; vm.tbCfCouponCategory={};
console.log("insertcoupon")
}, },
edit: function(){ edit: function(){
this.showEdit=false this.showEdit=false
vm.title = "设置优惠券发放"; vm.title = "设置优惠券发放";
vm.reload();
vm.tbCfCoupon = {}; vm.tbCfCoupon = {};
}, },
...@@ -393,17 +402,5 @@ let vm = new Vue({ ...@@ -393,17 +402,5 @@ let vm = new Vue({
handleReset2: function (name) { handleReset2: function (name) {
handleResetForm(this, name); handleResetForm(this, name);
} }
}, }
created(){
let that = this
$.get('../tbcfcoupon/queryAllCoupon',function (res) {
console.log(res.list)
that.Coupon = res.list;
})
let ta = this
$.get('../tbcfcouponcategory/queryAll',function (res1) {
console.log(res1.list)
ta.CouponCategory=res1.list;
})
}
}); });
platform-admin/src/main/webapp/js/sys/tbcforder.js
浏览文件 @ b303f62e
...@@ -310,6 +310,7 @@ let vm = new Vue({ ...@@ -310,6 +310,7 @@ let vm = new Vue({
}, },
//新增或者修改代购信息 //新增或者修改代购信息
saveOrUpdateAgentInfo: function () { saveOrUpdateAgentInfo: function () {
let that = this;
console.log(vm.agentInfo.descripitionId); console.log(vm.agentInfo.descripitionId);
console.log('11',vm.agentInfo); console.log('11',vm.agentInfo);
if(vm.agentInfo.descripitionId){ if(vm.agentInfo.descripitionId){
...@@ -325,6 +326,7 @@ let vm = new Vue({ ...@@ -325,6 +326,7 @@ let vm = new Vue({
layer.msg("保存成功", { layer.msg("保存成功", {
time: 2000 //2秒关闭（如果不配置，默认是3秒） time: 2000 //2秒关闭（如果不配置，默认是3秒）
}); });
that.reload();
} else { } else {
alert("保存失败"); alert("保存失败");
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论