+ {{ item.info.productInfo.storeName }}
+
+ {{ item.info.productInfo.attrInfo.suk }}
+
@@ -84,7 +86,7 @@
{
categoryApi.deleteCategroy(rowData).then(data => {
@@ -221,9 +259,14 @@ export default {
})
},
handlerGetTreeList() {
- const _pram = { type: this.biztype.value, status: this.selectModel ? 1 : -1 }
+ // this.biztype.value === 5 && !this.selectModel) ? -1 : 1
+ const _pram = { type: this.biztype.value, status: !this.selectModel ? -1 : (this.biztype.value === 5 ? -1 : 1) }
+ this.loading = true
this.biztype.value!==3 ? categoryApi.treeCategroy(_pram).then(data => {
this.treeList = this.handleAddArrt(data)
+ this.loading = false
+ }).catch(()=>{
+ this.loading = false
}) : categoryApi.listCategroy({ type: 3, status: '', pid: this.listPram.pid}).then(data => {
this.treeList = data.list
})
diff --git a/admin/src/components/FormGenerator/components/generator/js.js b/admin/src/components/FormGenerator/components/generator/js.js
index 77a0b16a..9052ffb4 100644
--- a/admin/src/components/FormGenerator/components/generator/js.js
+++ b/admin/src/components/FormGenerator/components/generator/js.js
@@ -181,7 +181,6 @@ function buildProps(scheme, propsList) {
// el-upload的BeforeUpload
function buildBeforeUpload(scheme) {
- console.log(scheme)
const config = scheme.__config__
const unitNum = units[config.sizeUnit]; let rightSizeCode = ''; let acceptCode = ''; const
returnList = []
diff --git a/admin/src/components/FormGenerator/index/FormDrawer.vue b/admin/src/components/FormGenerator/index/FormDrawer.vue
index af6c08aa..aae27b57 100644
--- a/admin/src/components/FormGenerator/index/FormDrawer.vue
+++ b/admin/src/components/FormGenerator/index/FormDrawer.vue
@@ -245,7 +245,6 @@ export default {
}
} catch (err) {
this.$message.error(`js错误：${err}`)
- console.error(err)
}
},
generateCode() {
diff --git a/admin/src/components/FormGenerator/index/Home.vue b/admin/src/components/FormGenerator/index/Home.vue
index d746431b..44ec9bd6 100644
--- a/admin/src/components/FormGenerator/index/Home.vue
+++ b/admin/src/components/FormGenerator/index/Home.vue
@@ -327,7 +327,6 @@ export default {
const clone = this.cloneComponent(item)
this.drawingList.push(clone)
this.activeFormItem(clone)
- console.log(this.drawingList)
},
cloneComponent(origin) {
const clone = JSON.parse(JSON.stringify(origin))
diff --git a/admin/src/components/RightPanel/index.vue b/admin/src/components/RightPanel/index.vue
index 55e8c1e5..8937efe6 100644
--- a/admin/src/components/RightPanel/index.vue
+++ b/admin/src/components/RightPanel/index.vue
@@ -2,7 +2,7 @@
-
+
编辑
- 发送货
+ 发送货
+ 立即核销
更多
@@ -158,8 +168,8 @@
订单详情
订单记录
订单备注
- 拒绝退款
- 立即退款
+ 拒绝退款
+ 立即退款
删除订单
@@ -274,11 +284,15 @@
diff --git a/admin/src/views/systemSetting/storeService/index.vue b/admin/src/views/systemSetting/storeService/index.vue
new file mode 100644
index 00000000..d2c9c01a
--- /dev/null
+++ b/admin/src/views/systemSetting/storeService/index.vue
@@ -0,0 +1,15 @@
+
+
-
-
-
+
+
+ 选择管理员
@@ -25,22 +16,10 @@
-
-
-
-
- 开启
- 关闭
-
-
-
-
- 开启
- 关闭
-
+
@@ -29,6 +29,7 @@ export default {
},
data() {
return {
+ isPhone: this.$wechat.isPhone(),
show: false
}
},
diff --git a/admin/src/components/ThemePicker/index.vue b/admin/src/components/ThemePicker/index.vue
index 3879c5ad..b0df471c 100644
--- a/admin/src/components/ThemePicker/index.vue
+++ b/admin/src/components/ThemePicker/index.vue
@@ -35,7 +35,6 @@ export default {
if (typeof val !== 'string') return
const themeCluster = this.getThemeCluster(val.replace('#', ''))
const originalCluster = this.getThemeCluster(oldVal.replace('#', ''))
- console.log(themeCluster, originalCluster)
const $message = this.$message({
message: ' Compiling the theme',
diff --git a/admin/src/components/Upload/uploadFile.vue b/admin/src/components/Upload/uploadFile.vue
index d394b06b..5e3f4569 100644
--- a/admin/src/components/Upload/uploadFile.vue
+++ b/admin/src/components/Upload/uploadFile.vue
@@ -8,60 +8,60 @@
:show-file-list="false"
multiple
>
-
{{ props.row.remark }}
+
+ {{ props.row.verifyCode }}
+
@@ -132,9 +135,15 @@
退款原因：{{scope.row.refundReasonWap}}
备注说明：{{scope.row.refundReasonWapExplain}}
退款时间：{{scope.row.refundReasonTime}}
-
+
退款凭证：
- ![]()
+
@@ -149,7 +158,8 @@
+
- 点击上传
+ 点击上传
-
diff --git a/admin/src/views/appSetting/routine/publicTemplate/creatPublicTemplate.vue b/admin/src/views/appSetting/routine/publicTemplate/creatPublicTemplate.vue
new file mode 100644
index 00000000..3017ae8f
--- /dev/null
+++ b/admin/src/views/appSetting/routine/publicTemplate/creatPublicTemplate.vue
@@ -0,0 +1,272 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/admin/src/views/appSetting/routine/publicTemplate/index.vue b/admin/src/views/appSetting/routine/publicTemplate/index.vue
new file mode 100644
index 00000000..8bc4e1e1
--- /dev/null
+++ b/admin/src/views/appSetting/routine/publicTemplate/index.vue
@@ -0,0 +1,157 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 请先从上方选择关键词
+
+
+
+
+
+
+ 提交
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.categoryId | wxCategoryFilter }}
+
+
+
+
+ {{ scope.row.type | wxTypeFilter }}
+
+
+
+
+
+ 选用
+
+
+
+
+
+
+
+
+
+
+
diff --git a/admin/src/views/login/auth-redirect.vue b/admin/src/views/login/auth-redirect.vue
index 7df89342..e3e1580b 100644
--- a/admin/src/views/login/auth-redirect.vue
+++ b/admin/src/views/login/auth-redirect.vue
@@ -1,3 +1,5 @@
+
+
+
diff --git a/admin/src/views/mobile/components/Loading.vue b/admin/src/views/mobile/components/Loading.vue
new file mode 100644
index 00000000..e17ee539
--- /dev/null
+++ b/admin/src/views/mobile/components/Loading.vue
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+ 正在加载中
+
+
+ 上拉加载更多
+
+
+
+
+
diff --git a/admin/src/views/mobile/components/PriceChange.vue b/admin/src/views/mobile/components/PriceChange.vue
new file mode 100644
index 00000000..4b13149e
--- /dev/null
+++ b/admin/src/views/mobile/components/PriceChange.vue
@@ -0,0 +1,257 @@
+
+
+
+
+
+
diff --git a/admin/src/views/mobile/components/WriteOff.vue b/admin/src/views/mobile/components/WriteOff.vue
new file mode 100644
index 00000000..89dcafa7
--- /dev/null
+++ b/admin/src/views/mobile/components/WriteOff.vue
@@ -0,0 +1,150 @@
+
+
+
+
+
+ {{
+ status === 0 || status === 2
+ ? orderInfo.refundStatus === 1
+ ? "立即退款"
+ : "一键改价"
+ : "订单备注"
+ }}
+
+
+
+
+
+
+ 商品总价(¥)
+
+ {{ orderInfo.totalPrice }}
+
+
+
+ 原始邮费(¥)
+
+ {{ orderInfo.payPostage }}
+
+
+
+ 实际支付(¥)
+
+
+
+
+
+ 实际支付(¥)
+
+ {{ orderInfo.payPrice }}
+
+
+
+ 退款金额(¥)
+
+
+
+
+
+
+
+ {{ orderInfo.refundStatus === 0 || status === 1 ? "立即修改" : "确认退款" }}
+
+
+ 拒绝退款
+
+
+
+
+
+
diff --git a/admin/src/views/mobile/components/statisticsData.vue b/admin/src/views/mobile/components/statisticsData.vue
new file mode 100644
index 00000000..1ca33850
--- /dev/null
+++ b/admin/src/views/mobile/components/statisticsData.vue
@@ -0,0 +1,68 @@
+
+
+ ![]()
+
+
+
+ {{ orderInfo.orderId }}
+
+
+ 查看
+
+ 确定要核销此订单吗？
+ 确定核销
+ 取消
+
+
+
+
+
+
+
diff --git a/admin/src/views/mobile/orderCancellation/index.vue b/admin/src/views/mobile/orderCancellation/index.vue
new file mode 100644
index 00000000..8f4700a4
--- /dev/null
+++ b/admin/src/views/mobile/orderCancellation/index.vue
@@ -0,0 +1,167 @@
+
+
+
+
+ 详细数据
+
+
+
+
+
+
+ {{ item.time }}
+ {{ item.count }}
+ {{ item.price }}
+
+
+
+
+
diff --git a/admin/src/views/mobile/orderStatistics/Statistics.vue b/admin/src/views/mobile/orderStatistics/Statistics.vue
new file mode 100644
index 00000000..fca96de9
--- /dev/null
+++ b/admin/src/views/mobile/orderStatistics/Statistics.vue
@@ -0,0 +1,477 @@
+
+
+
+
+
+
+
+
+
+ 立即核销
+
+ 
+
+
+
+
+
+
+
+
diff --git a/admin/src/views/mobile/orderStatistics/index.vue b/admin/src/views/mobile/orderStatistics/index.vue
new file mode 100644
index 00000000..1fbb5cfa
--- /dev/null
+++ b/admin/src/views/mobile/orderStatistics/index.vue
@@ -0,0 +1,146 @@
+
+
+
+
+ {{ title }}{{ this.where.type == 1 ? "营业额（元）" : "订单量（份）" }}
+
+ {{ time_price }}
+
+
+
+ {{ title }}增长率：{{ increase_time_status === 1 ? "" : "-" }}{{ growth_rate }}%
+
+
+
+ {{ title }}增长：{{ Number(increase_time).toFixed(2) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ where.type === 1 ? "单位（元）" : "单位（份）" }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/admin/src/views/mobile/orderStatistics/orderDelivery.vue b/admin/src/views/mobile/orderStatistics/orderDelivery.vue
new file mode 100644
index 00000000..b109480a
--- /dev/null
+++ b/admin/src/views/mobile/orderStatistics/orderDelivery.vue
@@ -0,0 +1,242 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ census.unpaidCount }}
+ 待付款
+ {{ census.unshippedCount }}
+ 待发货
+ {{ census.receivedCount }}
+ 待收货
+ {{ census.verificationCount }}
+ 待核销
+ {{ census.refundCount }}
+ 退款
+
+
+
+ 数据统计
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ census.todayPrice }}
+ 今日成交额
+ {{ census.proPrice }}
+ 昨日成交额
+ {{ census.monthPrice }}
+ 本月成交额
+ {{ census.todayCount }}
+ 今日订单数
+ {{ census.proCount }}
+ 昨日订单数
+ {{ census.monthCount }}
+ 本月订单数
+
+
+ 
+
+
+
+
+
diff --git a/admin/src/views/mobile/orderStatistics/orderDetail.vue b/admin/src/views/mobile/orderStatistics/orderDetail.vue
new file mode 100644
index 00000000..043b5fb5
--- /dev/null
+++ b/admin/src/views/mobile/orderStatistics/orderDetail.vue
@@ -0,0 +1,433 @@
+
+
+
+ 订单号：{{ orderId }}
+
+ {{ delivery.user.nickname }}
+
+
+
+
+ {{ delivery.realName
+ }}{{ delivery.userPhone }}
+
+ {{ delivery.userAddress }}
+
+
+
+
+
+ 发货方式
+
+
+
+ {{ item.title }}
+
+
+
+
+
+ 发货方式
+
+
+
+
+ 快递单号
+
+
+
+
+
+ 送货人
+
+
+
+ 送货电话
+
+ 确认提交
+
+
+
+
+
+
diff --git a/admin/src/views/mobile/orderStatistics/orderList.vue b/admin/src/views/mobile/orderStatistics/orderList.vue
new file mode 100644
index 00000000..59b5cc98
--- /dev/null
+++ b/admin/src/views/mobile/orderStatistics/orderList.vue
@@ -0,0 +1,389 @@
+
+
+
+ {{ title }}
+
+
+ 订单：{{ orderInfo.orderId }}
+
+ {{ orderInfo.createTime }}
+
+
+
+
+
+
+ {{ orderInfo.realName }}
+
+
+
+
+ {{ orderInfo.realName
+ }}{{ orderInfo.userPhone }}
+
+ {{ orderInfo.userAddress }}
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+ ￥{{ item.info.productInfo.price }}
+ x{{ item.info.cartNum }}
+ ￥{{ item.info.productInfo.otPrice }}
+
+ 共{{ orderInfo.totalNum }}件商品，应支付
+ ￥{{ orderInfo.payPrice }} ( 邮费 ¥{{
+ orderInfo.payPostage
+ }}
+ )
+
+
+
+
+
+ 订单编号：
+
+ {{ orderInfo.orderId
+ }}
+ 复制
+
+
+
+ 下单时间：
+ {{ orderInfo.createTime }}
+
+
+ 支付状态：
+
+ {{ orderInfo.paid == 1 ? "已支付" : "未支付" }}
+
+
+
+ 支付方式：
+ {{ orderInfo.payTypeStr }}
+
+
+ 买家留言：
+ {{ orderInfo.mark }}
+
+
+
+
+ 支付金额：
+ ￥{{ orderInfo.totalPrice }}
+
+
+ 优惠券抵扣：
+ -￥{{ orderInfo.couponPrice }}
+
+
+ 运费：
+ ￥{{ orderInfo.payPostage }}
+
+ 实付款：￥{{ orderInfo.payPrice }}
+
+
+
+
+
+
+
+ 配送方式：
+
+ 快递
+
+ 送货
+
+
+ 快递公司：
+ 送货人：
+ {{ orderInfo.deliveryName }}
+
+
+ 快递单号：
+ 送货人电话：
+
+ {{ orderInfo.deliveryId
+ }}复制
+
+
+
+
+
+
+
diff --git a/admin/src/views/order/index.vue b/admin/src/views/order/index.vue
index bafb552b..7ba09a90 100644
--- a/admin/src/views/order/index.vue
+++ b/admin/src/views/order/index.vue
@@ -64,6 +64,9 @@
+
+
+
+
+
+
+
+ 订单号：{{ item.orderId }}
+ 下单时间：{{ item.createTime }}
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+ {{ val.info.productInfo.storeName }}
+
+
+ {{ val.info.productInfo.attrInfo.suk }}
+
+
+
+ ￥{{ val.info.productInfo.attrInfo.price }}
+ x{{ val.info.cartNum }}
+
+
+
+
+ 共{{ item.totalNum }}件商品，应支付
+ ￥{{ item.payPrice }} ( 邮费 ¥{{
+ item.totalPostage
+ }}
+ )
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 去发货
+
+ 去核销
+
+
+
+ 一键改价
+
+ 订单备注
+
+ 立即退款
+
+
+
+
+
+
+
+
+ 暂无数据
+
+
+
+
无
+
+
+
+
+
+
diff --git a/admin/src/views/systemSetting/storeService/list/index.vue b/admin/src/views/systemSetting/storeService/list/index.vue
new file mode 100644
index 00000000..827727e6
--- /dev/null
+++ b/admin/src/views/systemSetting/storeService/list/index.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
diff --git a/admin/src/views/systemSetting/systemStore/clerkList/addClerk.vue b/admin/src/views/systemSetting/systemStore/clerkList/addClerk.vue
index 3642b827..5294353e 100644
--- a/admin/src/views/systemSetting/systemStore/clerkList/addClerk.vue
+++ b/admin/src/views/systemSetting/systemStore/clerkList/addClerk.vue
@@ -1,18 +1,9 @@
- {{ruleForm.avatar}}
-
+
-
-
-
-
-
@@ -55,6 +34,7 @@
diff --git a/app/pages/users/order_confirm/index.vue b/app/pages/users/order_confirm/index.vue
index 0151d2eb..8ca3fa62 100644
--- a/app/pages/users/order_confirm/index.vue
+++ b/app/pages/users/order_confirm/index.vue
@@ -270,7 +270,8 @@
isShowAuth: false, //是否隐藏授权
from: '',
news: true,
- again: false
+ again: false,
+ addAgain: false
};
},
computed: mapGetters(['isLogin']),
@@ -294,6 +295,7 @@
this.is_address = options.is_address ? true : false;
this.news = options.new || true;
this.again = options.again || false;
+ this.addAgain = options.addAgain || false;
if (this.isLogin) {
this.getaddressInfo();
this.getConfirm();
@@ -361,8 +363,8 @@
* 获取门店列表数据
*/
getList: function() {
- let longitude = uni.getStorageSync("CACHE_LONGITUDE"); //经度
- let latitude = uni.getStorageSync("CACHE_LATITUDE"); //纬度
+ let longitude = uni.getStorageSync("user_longitude"); //经度
+ let latitude = uni.getStorageSync("user_latitude"); //纬度
let data = {
latitude: latitude, //纬度
longitude: longitude, //经度
@@ -400,6 +402,7 @@
shippingType: parseInt(shippingType) + 1,
payType: this.payType
}).then(res => {
+ console.log(res)
let result = res.data.result.result;
if (result) {
this.totalPrice = result.orderId.payPrice;
@@ -408,7 +411,11 @@
this.integral = this.useIntegral ? result.orderId.surplusIntegral : this.userInfo.integral;
this.$set(this.priceGroup, 'storePostage', shippingType == 1 ? 0 : result.orderId.payPostage);
}
- })
+ }).catch(err => {
+ return this.$util.Tips({
+ title: err
+ });
+ });
},
addressType: function(e) {
let index = e;
@@ -494,7 +501,7 @@
*/
getConfirm: function() {
let that = this;
- orderConfirm(that.cartId,that.again).then(res => {
+ orderConfirm(that.cartId,that.news,this.addAgain).then(res => {
that.$set(that, 'userInfo', res.data.userInfo);
that.$set(that, 'integral', res.data.userInfo.integral);
that.$set(that, 'cartInfo', res.data.cartInfo);
@@ -570,17 +577,21 @@
let that = this;
if (that.addressId) {
getAddressDetail(that.addressId).then(res => {
- res.data.isDefault = parseInt(res.data.isDefault);
- that.addressInfo = res.data || {};
- that.addressId = res.data.id || 0;
- that.address.addressId = res.data.id || 0;
+ if(res.data){
+ res.data.isDefault = parseInt(res.data.isDefault);
+ that.addressInfo = res.data || {};
+ that.addressId = res.data.id || 0;
+ that.address.addressId = res.data.id || 0;
+ }
})
} else {
getAddressDefault().then(res => {
- res.data.isDefault = parseInt(res.data.isDefault);
- that.addressInfo = res.data || {};
- that.addressId = res.data.id || 0;
- that.address.addressId = res.data.id || 0;
+ if(res.data){
+ res.data.isDefault = parseInt(res.data.isDefault);
+ that.addressInfo = res.data || {};
+ that.addressId = res.data.id || 0;
+ that.address.addressId = res.data.id || 0;
+ }
})
}
},
@@ -820,8 +831,6 @@
title: '暂无门店,请选择其他方式'
});
}
- console.log('坎坎坷坷扩');
- console.log(that.news);
data = {
realName: that.contacts,
phone: that.contactsTel,
diff --git a/app/pages/users/user_get_coupon/index.vue b/app/pages/users/user_get_coupon/index.vue
index 832f3999..096d3c5e 100644
--- a/app/pages/users/user_get_coupon/index.vue
+++ b/app/pages/users/user_get_coupon/index.vue
@@ -108,8 +108,8 @@
that.$set(that,'couponsList',list);
that.$util.Tips({ title: '领取成功' });
},function(res){
- return that.$util.Tips({title:res.msg});
- });
+ return that.$util.Tips({title:res});
+ })
},
/**
* 获取领取优惠券列表
diff --git a/app/pages/users/wechat_login/index.vue b/app/pages/users/wechat_login/index.vue
new file mode 100644
index 00000000..74196aa9
--- /dev/null
+++ b/app/pages/users/wechat_login/index.vue
@@ -0,0 +1,373 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/plugin/chat/yzf_chat.js b/app/plugin/chat/yzf_chat.js
new file mode 100644
index 00000000..1defb445
--- /dev/null
+++ b/app/plugin/chat/yzf_chat.js
@@ -0,0 +1 @@
+!function(e){var t={};function n(i){if(t[i])return t[i].exports;var o=t[i]={i:i,l:!1,exports:{}};return e[i].call(o.exports,o,o.exports,n),o.l=!0,o.exports}n.m=e,n.c=t,n.d=function(e,t,i){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:i})},n.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"===typeof e&&e&&e.__esModule)return e;var i=Object.create(null);if(n.r(i),Object.defineProperty(i,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)n.d(i,o,function(t){return e[t]}.bind(null,o));return i},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="./",n(n.s=3)}([function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var i=+new Date,o="yzfh5-data-"+i,a="yzfh5-main-chat-"+i,r="yzfh5-main-iframe-"+i,c="yzfh5-main-contact-"+i,d="yzfh5-chat-btn-"+i,s="yzfh5-dot-"+i,l="yzfh5-state-"+i,u="yzfh5-icon-"+i;t.default={scope:o,mainChatId:a,mainIframeId:r,mainContactId:c,chatBtnId:d,dotId:s,stateId:l,iconId:u}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default={isMobile:function(){var e=!1;return/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)&&(e=!0),e}()}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.getElem=function(e){return document.getElementById(e)},t.hideElem=function(e){e.style.display="none"},t.showElem=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"block";e.style.display=t}},function(e,t,n){e.exports=n(4)},function(e,t,n){"use strict";var i=n(5),o=Object({NODE_ENV:"development",YZF_CHAT_WEB_CHAT:"https://yzf.qq.com/xv/web/static/chat/index.html",YZF_CHAT_WEB_PREFIX:"https://yzf.qq.com/xv/web"})||!1,a=o.YZF_CHAT_WEB_CHAT,r=void 0===a?"https://yzf.qq.com/xv/web/static/chat/index.html":a,c=o.YZF_CHAT_WEB_PREFIX,d=void 0===c?"https://yzf.qq.com/xv/web":c,s=!1,l={init:function(e){if(!s){var t=e.sign||"",n=e.data||{},o=e.uid||"",a=e.selector||"",c=e.callback,l=!("rmb"in e)||e.rmb,u="goodImg"in e?e.goodImg:"contain",f=!0===e.nofixed,p=r+"?inner=1&sign="+t+"&uid="+o+"&rmb="+l+"&goodImg="+u;if(n&&Object.keys(n).length)p+="&c1="+(n.c1||""),p+="&c2="+(n.c2||""),p+="&c3="+(n.c3||""),p+="&c4="+(n.c4||""),p+="&c5="+(n.c5||"");f&&(p+="&nofixed=1"),(0,i.render)(p,d,a,c,t),s=!0}},close:function(){(0,i.close)()}};window.yzf=l},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.render=function(e,t,n,c,s){var h=(0,i.default)({id:o.default,isMobile:f});h=(h=h.replace(new RegExp(u,"g"),o.default.scope)).replace(new RegExp("https://kf.qq.com/xv-dev/web","g"),t);var x=document.createElement("div");x.innerHTML=h,x.style.display="none",document.body.appendChild(x);var b=function(){x.style.display="block"},g=setTimeout(b,3e3),y=(0,r.getElem)(o.default.mainChatId);!f&&(y.style.zIndex=2147483647);var _=(0,r.getElem)(o.default.dotId),v=(0,r.getElem)(o.default.stateId),E=(0,r.getElem)(o.default.mainIframeId),w=(0,r.getElem)(o.default.mainContactId),I=w;if(n)try{var F=document.querySelector(n);F&&(p=!1,I=F,w.remove(),clearTimeout(g),g=null,b())}catch(Y){console.error(Y)}p&&(0,d.loadTheme)(t,s,function(e,t){var n=!1;if(e&&t&&0==t.status){var i=null;try{i=JSON.parse(t.data)}catch(Y){}if(i&&i.custom_color){var a=i.custom_color,c=(0,r.getElem)(o.default.chatBtnId);console.log(2222,e,t,i,c),c&&(c.style.backgroundColor=a,c.parentNode&&c.parentNode.parentNode&&(c.parentNode.parentNode.style.display="block"))}else n=!0}else n=!0;clearTimeout(g),g=null,n&&b(),(0,r.showElem)(w)});I.addEventListener("click",function(){l||(l=!0,E.src=e,E.onload=function(){E.contentWindow.postMessage({type:"init"},"*")}),(0,r.showElem)(y),p&&((0,r.hideElem)(I),(0,r.hideElem)(_),(0,r.hideElem)(v))}),a.default.listen(I,c,p),p&&(window.onresize=m,m())},t.close=function(){var e=(0,r.getElem)(o.default.mainChatId),t=(0,r.getElem)(o.default.mainContactId);(0,r.hideElem)(e),p&&(0,r.showElem)(t)};var i=s(n(6)),o=s(n(0)),a=s(n(10)),r=n(2),c=s(n(1)),d=n(11);function s(e){return e&&e.__esModule?e:{default:e}}var l=!1,u="YZF_STYLE_PREFIX",f=c.default.isMobile,p=!0;function m(){var e=(0,r.getElem)(o.default.chatBtnId).getElementsByClassName("txt")[0],t=window.innerWidth;e.textContent=t>=1e3?"\u8054\u7cfb\u5ba2\u670d":"\u5ba2\u670d"}},function(e,t,n){var i=n(7);e.exports=function(e){"use strict";e=e||{};var t="",n=i.$escape,o=e.id,a=e.isMobile;return t+='\n\n'}},function(e,t,n){"use strict";e.exports=n(8)},function(e,t,n){"use strict";(function(t){var n="undefined"!==typeof self?self:"undefined"!==typeof window?window:"undefined"!==typeof t?t:{},i=Object.create(n),o=/["&'<>]/;i.$escape=function(e){return function(e){var t=""+e,n=o.exec(t);if(!n)return e;var i="",a=void 0,r=void 0,c=void 0;for(a=n.index,r=0;a=200&&this.status<300||304===this.status){var e=this.responseText;try{var n=JSON.parse(e);n?t(!0,n):t(!1)}catch(i){t(!1)}}},n.ontimeout=function(){t(!1)},n.onerror=function(){t(!1)},n.open("GET",e),n.send(null)}}]);
\ No newline at end of file
diff --git a/app/store/getters.js b/app/store/getters.js
index 4b6be6e3..789199c2 100644
--- a/app/store/getters.js
+++ b/app/store/getters.js
@@ -6,6 +6,7 @@ export default {
uid:state => state.app.uid,
homeActive: state => state.app.homeActive,
home: state => state.app.home,
+ chatUrl: state => state.app.chatUrl
};
// export default {
// token: state => 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJrYWlmYS5jcm1lYi5uZXQiLCJhdWQiOiJrYWlmYS5jcm1lYi5uZXQiLCJpYXQiOjE1NzcwODM1MzQsIm5iZiI6MTU3NzA4MzUzNCwiZXhwIjoxNTc3MDk0MzM0LCJqdGkiOnsiaWQiOjExMCwidHlwZSI6InVzZXIifX0.U-i1pbdRjyXI1gr79Uq2XBPZ89T8f5Ai9jwrR8woTwE',
diff --git a/app/store/modules/app.js b/app/store/modules/app.js
index c53bbdf2..d25f8175 100644
--- a/app/store/modules/app.js
+++ b/app/store/modules/app.js
@@ -16,6 +16,7 @@ const state = {
userInfo: null,
uid: Cache.get(UID) || null,
homeActive: false,
+ chatUrl: Cache.get('chatUrl') || '',
};
const mutations = {
@@ -49,6 +50,9 @@ const mutations = {
CLOSE_HOME(state) {
state.homeActive = false;
},
+ SET_CHATURL(state, chatUrl){
+ state.chatUrl = chatUrl;
+ }
};
const actions = {
diff --git a/app/utils/SubscribeMessage.js b/app/utils/SubscribeMessage.js
index ddb8cf9b..7f17b298 100644
--- a/app/utils/SubscribeMessage.js
+++ b/app/utils/SubscribeMessage.js
@@ -1,25 +1,22 @@
-import {
- SUBSCRIBE_MESSAGE
-} from '../config/cache.js';
+// import {
+// SUBSCRIBE_MESSAGE
+// } from '../config/cache.js';
+const arrTemp = ["paySubscribe","orderSubscribe","extrctSubscribe", "orderRefundSubscribe", "rechargeSubscribe"];
-export function auth() {
- let tmplIds = {};
- let messageTmplIds = uni.getStorageSync(SUBSCRIBE_MESSAGE);
- tmplIds = messageTmplIds ? JSON.parse(messageTmplIds) : {};
- return tmplIds;
-}
+// export function auth() {
+// let tmplIds = {};
+// let messageTmplIds = uni.getStorageSync(SUBSCRIBE_MESSAGE);
+// tmplIds = messageTmplIds ? JSON.parse(messageTmplIds) : {};
+// return tmplIds;
+// }
/**
* 支付成功后订阅消息id
* 订阅 确认收货通知 订单支付成功 新订单管理员提醒
*/
export function openPaySubscribe() {
- let tmplIds = auth();
- return subscribe([
- tmplIds.oreder_takever,
- tmplIds.order_pay_success,
- tmplIds.order_new,
- ]);
+ let tmplIds = uni.getStorageSync('tempID' + arrTemp[0]);
+ return subscribe(tmplIds);
}
/**
@@ -27,12 +24,8 @@ export function openPaySubscribe() {
* 送货 发货 取消订单
*/
export function openOrderSubscribe() {
- let tmplIds = auth();
- return subscribe([
- tmplIds.order_deliver_success,
- tmplIds.order_postage_success,
- tmplIds.order_clone
- ]);
+ let tmplIds = uni.getStorageSync('tempID' + arrTemp[1]);
+ return subscribe(tmplIds);
}
/**
@@ -40,10 +33,8 @@ export function openOrderSubscribe() {
* 成功 和 失败 消息
*/
export function openExtrctSubscribe() {
- let tmplIds = auth();
- return subscribe([
- tmplIds.user_extract
- ]);
+ let tmplIds = uni.getStorageSync('tempID' + arrTemp[2]);
+ return subscribe(tmplIds);
}
/**
@@ -70,25 +61,25 @@ export function openBargainSubscribe() {
* 订单退款
*/
export function openOrderRefundSubscribe() {
- let tmplIds = auth();
- return subscribe([tmplIds.order_refund]);
+ let tmplIds = uni.getStorageSync('tempID' + arrTemp[3]);
+ return subscribe(tmplIds);
}
/**
* 充值成功
*/
export function openRechargeSubscribe() {
- let tmplIds = auth();
- return subscribe([tmplIds.recharge_success]);
+ let tmplIds = uni.getStorageSync('tempID' + arrTemp[4]);
+ return subscribe(tmplIds);
}
-/**
- * 提现
- */
-export function openEextractSubscribe() {
- let tmplIds = auth();
- return subscribe([tmplIds.user_extract]);
-}
+// /**
+// * 提现
+// */
+// export function openEextractSubscribe() {
+// let tmplIds = JSON.parse(uni.getStorageSync('tempID' + paySubscribe));
+// return subscribe(tmplIds);
+// }
/**
* 调起订阅界面
diff --git a/app/utils/index.js b/app/utils/index.js
index cd61145b..31c132ce 100644
--- a/app/utils/index.js
+++ b/app/utils/index.js
@@ -2,7 +2,7 @@ import { spread } from "@/api/user";
import Cache from "@/utils/cache";
/**
- * 绑定用户授权
+ * 静默授权绑定上下级，使用在已经登录后扫描了别人的推广二维码
* @param {Object} puid
*/
export function silenceBindingSpread()
@@ -25,20 +25,21 @@ export function silenceBindingSpread()
puid = 0;
}
if(puid){
- spread(puid).then(res=>{
- console.log(res);
- //#ifdef H5
- Cache.clear('spread');
- //#endif
-
- //#ifdef MP
- getApp().globalData.spid = 0;
- getApp().globalData.code = 0;
- //#endif
-
- }).catch(res=>{
- console.log(res);
- });
+ //#ifdef H5
+ Cache.set('spread', 0);
+ //#endif
+
+ //#ifdef MP
+ getApp().globalData.spid = 0;
+ getApp().globalData.code = 0;
+ //#endif
+ // spread(puid).then(res=>{
+ // console.log(res);
+ // }).catch(res=>{
+ // console.log(res);
+ // });
+ }else{
+ Cache.set('spread', 0);
}
}
diff --git a/app/utils/request.js b/app/utils/request.js
index db8cd04b..f369e7f8 100644
--- a/app/utils/request.js
+++ b/app/utils/request.js
@@ -27,7 +27,7 @@ function baseRequest(url, method, data, {
if (!store.state.app.token && !checkLogin()) {
toLogin();
return Promise.reject({
- msg: '未登陆'
+ msg: '未登录'
});
}
}
diff --git a/crmeb_java_v1.0.sql b/crmeb/sql/crmeb_java_v1.0.sql
similarity index 100%
rename from crmeb_java_v1.0.sql
rename to crmeb/sql/crmeb_java_v1.0.sql
diff --git a/crmeb/sql/crmeb_java_v1.1.sql b/crmeb/sql/crmeb_java_v1.1.sql
new file mode 100644
index 00000000..bdc0742d
--- /dev/null
+++ b/crmeb/sql/crmeb_java_v1.1.sql
@@ -0,0 +1,6698 @@
+# ************************************************************
+# Sequel Pro SQL dump
+# Version 4541
+#
+# http://www.sequelpro.com/
+# https://github.com/sequelpro/sequelpro
+#
+# Host: 127.0.0.1 (MySQL 5.7.23)
+# Database: crmeb_java
+# Generation Time: 2020-09-15 08:10:24 +0000
+# ************************************************************
+
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+
+# Dump of table eb_article
+# ------------------------------------------------------------
+
+DROP TABLE IF EXISTS `eb_article`;
+
+CREATE TABLE `eb_article` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT '文章管理ID',
+ `cid` varchar(255) NOT NULL DEFAULT '' COMMENT '分类id',
+ `title` varchar(255) NOT NULL COMMENT '文章标题',
+ `author` varchar(255) DEFAULT '' COMMENT '文章作者',
+ `image_input` varchar(255) NOT NULL COMMENT '文章图片',
+ `synopsis` varchar(255) DEFAULT '' COMMENT '文章简介',
+ `share_title` varchar(255) DEFAULT '' COMMENT '文章分享标题',
+ `share_synopsis` varchar(255) DEFAULT '' COMMENT '文章分享简介',
+ `visit` varchar(255) DEFAULT '' COMMENT '浏览次数',
+ `sort` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '排序',
+ `url` varchar(255) DEFAULT '' COMMENT '原文链接',
+ `media_id` varchar(100) DEFAULT NULL COMMENT '微信素材id',
+ `status` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '状态',
+ `hide` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '是否隐藏',
+ `admin_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '管理员id',
+ `mer_id` int(10) unsigned DEFAULT '0' COMMENT '商户id',
+ `product_id` int(10) NOT NULL DEFAULT '0' COMMENT '商品关联id',
+ `is_hot` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '是否热门(小程序)',
+ `is_banner` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '是否轮播图(小程序)',
+ `content` text NOT NULL COMMENT '文章内容',
+ `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+ `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='文章管理表';
+
+LOCK TABLES `eb_article` WRITE;
+/*!40000 ALTER TABLE `eb_article` DISABLE KEYS */;
+
+INSERT INTO `eb_article` (`id`, `cid`, `title`, `author`, `image_input`, `synopsis`, `share_title`, `share_synopsis`, `visit`, `sort`, `url`, `media_id`, `status`, `hide`, `admin_id`, `mer_id`, `product_id`, `is_hot`, `is_banner`, `content`, `create_time`, `update_time`)
+VALUES
+ (1,'57','2019苹果新品发布会：iPhone 11 Pro系列发布','陈功','image/content/2020/08/13/312234fff7f24c37bcedd117f1572b3e5z7eydhpyr.png','阿达萨','2019苹果新品发布会：iPhone 11 Pro系列发布','阿达萨','',0,'http://www.techweb.com.cn/ucweb/news/id/2753912',NULL,0,0,0,0,0,1,1,' login(@RequestParam(value = "code") String code, HttpServletRequest request){
+ return CommonResult.success(systemAdminService.weChatAuthorizeLogin(code, CrmebUtil.getClientIp(request)));
+ }
+
+ /**
+ * 解绑微信
+ * @author Mr.Zhang
+ * @since 2020-05-25
+ */
+ @ApiOperation(value = "解绑微信")
+ @RequestMapping(value = "/unbind", method = RequestMethod.GET)
+ public CommonResult bind(){
+ return CommonResult.success(systemAdminService.unBind());
+ }
}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/config/WebConfig.java b/crmeb/src/main/java/com/zbkj/crmeb/config/WebConfig.java
index 780c2852..7e05891e 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/config/WebConfig.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/config/WebConfig.java
@@ -65,6 +65,8 @@ public class WebConfig implements WebMvcConfigurer {
excludePathPatterns("/api/admin/login").
excludePathPatterns("/api/admin/logout").
excludePathPatterns("/api/admin/getLoginPic").
+ excludePathPatterns("/api/admin/wechat/config").
+ excludePathPatterns("/api/admin/authorize/login").
excludePathPatterns("/api/admin/payment/callback/**").
excludePathPatterns("/swagger-resources/**", "/webjars/**", "/v2/**", "/swagger-ui.html/**");
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/finance/service/impl/UserExtractServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/finance/service/impl/UserExtractServiceImpl.java
index 1f3be7c9..ce3f1aa9 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/finance/service/impl/UserExtractServiceImpl.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/finance/service/impl/UserExtractServiceImpl.java
@@ -18,6 +18,8 @@ import com.zbkj.crmeb.finance.service.UserExtractService;
import com.zbkj.crmeb.system.service.SystemConfigService;
import com.zbkj.crmeb.user.service.UserBillService;
import com.zbkj.crmeb.user.service.UserService;
+import com.zbkj.crmeb.wechat.service.impl.WechatSendMessageForMinService;
+import com.zbkj.crmeb.wechat.vo.WechatSendMessageForCash;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -49,6 +51,9 @@ public class UserExtractServiceImpl extends ServiceImpl> get(@RequestParam String url) {
return CommonResult.success(qrCodeService.base64(url));
}
+
+ /**
+ * 远程图片转base64
+ * @author Mr.Zhang
+ * @since 2020-04-16
+ * @return CommonResult
+ */
+ @ApiOperation(value="将字符串 转base64")
+ @RequestMapping(value = "/str2base64", method = RequestMethod.POST)
+ public CommonResult> getQrcodeByString(
+ @RequestParam String text,
+ @RequestParam int width,
+ @RequestParam int height) {
+ if((width < 50 || height < 50) && (width > 500 || height > 500) && text.length() >= 999){
+ throw new CrmebException(Constants.RESULT_QRCODE_PRAMERROR);
+ }
+ return CommonResult.success(qrCodeService.base64String(text, width,height));
+ }
}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/front/controller/StoreOrderController.java b/crmeb/src/main/java/com/zbkj/crmeb/front/controller/StoreOrderController.java
index 40b141b4..6ec8defa 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/front/controller/StoreOrderController.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/front/controller/StoreOrderController.java
@@ -43,8 +43,9 @@ public class StoreOrderController {
@ApiOperation(value = "确认订单")
@RequestMapping(value = "/confirm", method = RequestMethod.POST)
public CommonResult OrderConForm(@RequestParam String cartIds,
- @RequestParam boolean isNew){
- return CommonResult.success(orderService.confirmOrder(CrmebUtil.stringToArrayInt(cartIds),isNew));
+ @RequestParam(value = "boolean", defaultValue = "false") boolean isNew,
+ @RequestParam(value = "addAgain", defaultValue = "false") boolean addAgain){
+ return CommonResult.success(orderService.confirmOrder(CrmebUtil.stringToArrayInt(cartIds),isNew,addAgain));
}
/**
@@ -105,7 +106,7 @@ public class StoreOrderController {
@ApiOperation(value = "订单列表")
@RequestMapping(value = "/list", method = RequestMethod.GET)
@ApiImplicitParams ({
- @ApiImplicitParam(name = "type", value = "评价等级|0=未支付,1=待发货,2=待收货,3=待评价,4=已完成", required = true)
+ @ApiImplicitParam(name = "type", value = "评价等级|0=未支付,1=待发货,2=待收货,3=待评价,4=已完成,-3=售后/退款", required = true)
})
public CommonResult> orderList(
@RequestParam(name = "type") Integer type,
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/front/controller/WeChatController.java b/crmeb/src/main/java/com/zbkj/crmeb/front/controller/WeChatController.java
index 84886e10..f6097e1e 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/front/controller/WeChatController.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/front/controller/WeChatController.java
@@ -1,12 +1,16 @@
package com.zbkj.crmeb.front.controller;
import com.common.CommonResult;
+import com.common.PageParamRequest;
import com.zbkj.crmeb.front.response.LoginResponse;
import com.zbkj.crmeb.front.service.UserCenterService;
import com.zbkj.crmeb.user.request.RegisterThirdUserRequest;
import com.zbkj.crmeb.wechat.model.TemplateMessage;
+import com.zbkj.crmeb.wechat.model.WechatProgramMyTemp;
+import com.zbkj.crmeb.wechat.request.WechatProgramMyTempSearchRequest;
import com.zbkj.crmeb.wechat.service.TemplateMessageService;
import com.zbkj.crmeb.wechat.service.WeChatService;
+import com.zbkj.crmeb.wechat.service.WechatProgramMyTempService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
@@ -16,6 +20,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
@@ -37,6 +42,9 @@ public class WeChatController {
@Autowired
private TemplateMessageService templateMessageService;
+ @Autowired
+ private WechatProgramMyTempService wechatProgramMyTempService;
+
/**
* 获取授权页面跳转地址
* @author Mr.Zhang
@@ -110,6 +118,17 @@ public class WeChatController {
TemplateMessage templateMessage = templateMessageService.infoException(id);
return CommonResult.success(templateMessage);
}
+
+ /**
+ * 订阅消息模板列表
+ * @author Mr.Zhang
+ * @since 2020-06-03
+ */
+ @ApiOperation(value = "订阅消息模板列表")
+ @RequestMapping(value = "/program/my/temp/list", method = RequestMethod.POST)
+ public CommonResult> programMyTempList(@RequestBody @Validated WechatProgramMyTempSearchRequest request, PageParamRequest pageParamRequest){
+ return CommonResult.success(wechatProgramMyTempService.getList(request, pageParamRequest));
+ }
}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/front/response/OrderDataResponse.java b/crmeb/src/main/java/com/zbkj/crmeb/front/response/OrderDataResponse.java
index 2d19519c..1a4ccdf4 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/front/response/OrderDataResponse.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/front/response/OrderDataResponse.java
@@ -15,6 +15,7 @@ import java.math.BigDecimal;
public class OrderDataResponse {
private int completeCount;
private int evaluatedCount;
+ private int verificationCount;
private int orderCount;
private int receivedCount;
private int refundCount;
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/front/response/UserCenterResponse.java b/crmeb/src/main/java/com/zbkj/crmeb/front/response/UserCenterResponse.java
index 923821b4..13c2e780 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/front/response/UserCenterResponse.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/front/response/UserCenterResponse.java
@@ -35,8 +35,8 @@ public class UserCenterResponse implements Serializable {
@ApiModelProperty(value = "用户账号")
private String account;
- @ApiModelProperty(value = "用户密码")
- private String pwd;
+// @ApiModelProperty(value = "用户密码")
+// private String pwd;
@ApiModelProperty(value = "真实姓名")
private String realName;
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/front/service/OrderService.java b/crmeb/src/main/java/com/zbkj/crmeb/front/service/OrderService.java
index 9f495d8f..4468688c 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/front/service/OrderService.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/front/service/OrderService.java
@@ -29,7 +29,7 @@ public interface OrderService {
* @param cartIds 购物车id集合
* @return 确认订单信息
*/
- ConfirmOrderResponse confirmOrder(List cartIds, boolean isNew);
+ ConfirmOrderResponse confirmOrder(List cartIds, boolean isNew, boolean addAgain);
/**
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/front/service/QrCodeService.java b/crmeb/src/main/java/com/zbkj/crmeb/front/service/QrCodeService.java
index d5f94ff7..3f83cf8d 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/front/service/QrCodeService.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/front/service/QrCodeService.java
@@ -14,4 +14,7 @@ public interface QrCodeService {
Map get(JSONObject data) throws IOException;
Map base64(String url);
+
+ Map base64String(String text,int width, int height);
+
}
\ No newline at end of file
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/front/service/impl/OrderServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/front/service/impl/OrderServiceImpl.java
index c2ad277d..df04dc79 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/front/service/impl/OrderServiceImpl.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/front/service/impl/OrderServiceImpl.java
@@ -36,6 +36,9 @@ import com.zbkj.crmeb.user.model.User;
import com.zbkj.crmeb.user.model.UserAddress;
import com.zbkj.crmeb.user.service.UserAddressService;
import com.zbkj.crmeb.user.service.UserService;
+import com.zbkj.crmeb.wechat.service.impl.WechatSendMessageForMinService;
+import com.zbkj.crmeb.wechat.vo.WechatSendMessageForCreateOrder;
+import com.zbkj.crmeb.wechat.vo.WechatSendMessageForReFundNotify;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -103,6 +106,9 @@ public class OrderServiceImpl implements OrderService {
@Autowired
private LogisticService logisticsService;
+ @Autowired
+ private WechatSendMessageForMinService wechatSendMessageForMinService;
+
/**
* 确认订单
* @param cartIds 购物车id集合
@@ -110,7 +116,7 @@ public class OrderServiceImpl implements OrderService {
* @return 确认订单response
*/
@Override
- public ConfirmOrderResponse confirmOrder(List cartIds, boolean isNew) {
+ public ConfirmOrderResponse confirmOrder(List cartIds, boolean isNew, boolean addAgain) {
ConfirmOrderResponse response = new ConfirmOrderResponse();
// 获取运费默认模版
ShippingTemplates template = shippingTemplatesService.getById(69);// todo 这里的默认模版写死
@@ -119,11 +125,12 @@ public class OrderServiceImpl implements OrderService {
List storeCartResponse = new ArrayList<>();
// isNew=false 从购物车获取 isNew=true 从缓存中获取=再次下单
- if(isNew){
+ if(addAgain){ // 获取重新购买数据
storeCartResponse= orderUtils.getCacheOrderAgain(cartIds.get(0)+""); // todo 按照存储规格这里应该只会有一个值
-
- }else {
- storeCartResponse = storeCartService.getListByUserIdAndCartIds(currentUserInfo.getUid(),cartIds);
+ }else if(isNew){// 获取立即购买数据
+ storeCartResponse = storeCartService.getListByUserIdAndCartIds(currentUserInfo.getUid(),cartIds,1);
+ }else{ // 获取购物车数据
+ storeCartResponse = storeCartService.getListByUserIdAndCartIds(currentUserInfo.getUid(),cartIds,null);
}
// todo 跳过拼团秒杀和砍价
@@ -244,6 +251,12 @@ public class OrderServiceImpl implements OrderService {
orderPayResponse.setResult(itemResponse);
}
+ // 小程序消息订阅发送
+ WechatSendMessageForCreateOrder createOrder = new WechatSendMessageForCreateOrder(
+ orderUtils.getPayTypeStrByOrder(orderCreated),orderUtils.getStoreNameAndCarNumString(orderCreated.getId()),
+ orderCreated.getPayPrice()+"",orderCreated.getId()+"","CRMEB",orderCreated.getCreateTime()+"","创建订单成功","暂无地址",
+ orderUtils.getPayTypeStrByOrder(orderCreated),orderCreated.getUserAddress());
+ wechatSendMessageForMinService.sendCreateOrderMessage(createOrder, userService.getUserIdException());
return orderPayResponse;
}
@@ -367,8 +380,6 @@ public class OrderServiceImpl implements OrderService {
smsInfo.put("adminName", currentUser.getNickname());
boolean codeResult = smsService.pushCodeToList(currentUser.getPhone(),1, smsInfo);
if(!codeResult) throw new CrmebException("短信加入发送队列失败");
-
-// redisUtil.lPush(Constants.ORDER_TASK_REDIS_KEY_AFTER_REFUND_BY_USER, existStoreOrder.getId());
return true;
}
@@ -396,6 +407,17 @@ public class OrderServiceImpl implements OrderService {
storeOrder.setRefundReason(request.getText());
storeOrder.setRefundPrice(storeOrder.getPayPrice());
storeOrder.setRefundReasonTime(DateUtil.nowDateTime());
+
+ // 发送微信小程序订阅消息
+ String storeNameAndCarNumString = orderUtils.getStoreNameAndCarNumString(storeOrder.getId());
+ if(StringUtils.isNotBlank(storeNameAndCarNumString)){
+ WechatSendMessageForReFundNotify notify = new WechatSendMessageForReFundNotify(
+ storeNameAndCarNumString,storeOrder.getPayPrice().toString(),
+ storeOrder.getCreateTime().toString(),storeOrder.getOrderId()+"",DateUtil.nowDateTimeStr(),
+ "CRMEB","发起申请",request.getExplain(),storeOrder.getPayPrice()+"",
+ request.getText(),storeOrder.getUserPhone(),"CRMEB");
+ wechatSendMessageForMinService.sendReFundNotifyMessage(notify, userService.getUserId());
+ }
return storeOrderService.updateById(storeOrder);
}
@@ -533,7 +555,7 @@ public class OrderServiceImpl implements OrderService {
BeanUtils.copyProperties(storeOrderResult, storeOrderDetailResponse);
// 是否开启门店自提
String storeSelfMention = systemConfigService.getValueByKey("store_self_mention");
- if(Boolean.valueOf(storeSelfMention)) storeOrderResult.setShippingType(1);
+ if(!Boolean.valueOf(storeSelfMention)) storeOrderResult.setShippingType(1);
if(storeOrderResult.getVerifyCode().length()>0){
String verifyCode = storeOrderResult.getVerifyCode();
List verifyCodeList = new ArrayList<>();
@@ -547,8 +569,8 @@ public class OrderServiceImpl implements OrderService {
storeOrderDetailResponse.setAddTimeH(dateY);
storeOrderDetailResponse.setAddTimeH(dateH);
SystemStore systemStorePram = new SystemStore();
- systemStorePram.setIsShow(true);
- systemStorePram.setIsDel(false);
+// systemStorePram.setIsShow(true);
+// systemStorePram.setIsDel(false);
systemStorePram.setId(storeOrderResult.getStoreId());
storeOrderDetailResponse.setSystemStore(systemStoreService.getByCondition(systemStorePram));
@@ -594,8 +616,8 @@ public class OrderServiceImpl implements OrderService {
result.setUnShippedCount(storeOrderService.getTopDataUtil(Constants.ORDER_STATUS_H5_NOT_SHIPPED, currentUser.getUid()).size());
// 待收货
result.setReceivedCount(storeOrderService.getTopDataUtil(Constants.ORDER_STATUS_H5_SPIKE, currentUser.getUid()).size());
- // 待评价
- result.setEvaluatedCount(storeOrderService.getTopDataUtil(Constants.ORDER_STATUS_H5_BARGAIN, currentUser.getUid()).size());
+ // 待核销
+ result.setEvaluatedCount(storeOrderService.getTopDataUtil(Constants.ORDER_STATUS_H5_VERF, currentUser.getUid()).size());
// 已完成
result.setCompleteCount(storeOrderService.getTopDataUtil(Constants.ORDER_STATUS_H5_COMPLETE, currentUser.getUid()).size());
// 退款中
@@ -743,11 +765,11 @@ public class OrderServiceImpl implements OrderService {
* 仅仅支付
* 订单支付完之后给出状态值 以便前端使用， 后期这里也可以抽出对象
* ORDEREEXIST, EXTENDORDER, PAYERROR, SUCCESS, WECHATPAY, PAYDEFICIENCY, WECHATH5PAY
- * @param request
- * @param ip
- * @param resultMap
- * @param existStoreOrder
- * @return
+ * @param request 支付订单参数
+ * @param ip 发起支付IP
+ * @param resultMap 计算订单时价格集合
+ * @param existStoreOrder 当前订单
+ * @return 支付状态
*/
@Transactional(rollbackFor = {RuntimeException.class, Error.class, CrmebException.class})
public boolean doPayOrder(OrderPayRequest request, String ip, HashMap resultMap, StoreOrder existStoreOrder) {
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/front/service/impl/ProductServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/front/service/impl/ProductServiceImpl.java
index 42ac4d0e..f9f9a45e 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/front/service/impl/ProductServiceImpl.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/front/service/impl/ProductServiceImpl.java
@@ -152,16 +152,15 @@ public class ProductServiceImpl implements ProductService {
// 设置点赞和收藏
User user = userService.getInfo();
- if(null != user){
- if(null != user.getUid()){
- storeInfo.setUserLike(storeProductRelationService.getLikeOrCollectByUser(user.getUid(),id,true).size() > 0);
- storeInfo.setUserCollect(storeProductRelationService.getLikeOrCollectByUser(user.getUid(),id,false).size() > 0);
- user = userService.updateForPromoter(user);
- productDetailResponse.setPriceName(getPacketPriceRange(productResponse,user.getIsPromoter()));
- }
+ if(null != user && null != user.getUid()){
+ storeInfo.setUserLike(storeProductRelationService.getLikeOrCollectByUser(user.getUid(),id,true).size() > 0);
+ storeInfo.setUserCollect(storeProductRelationService.getLikeOrCollectByUser(user.getUid(),id,false).size() > 0);
+// user = userService.updateForPromoter(user);
+ productDetailResponse.setPriceName(getPacketPriceRange(productResponse,user.getIsPromoter()));
+ }else{
+ storeInfo.setUserLike(false);
+ storeInfo.setUserCollect(false);
}
- storeInfo.setUserLike(false);
- storeInfo.setUserCollect(false);
productDetailResponse.setStoreInfo(storeInfo);
// 根据制式设置attr属性
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/front/service/impl/QrCodeServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/front/service/impl/QrCodeServiceImpl.java
index 59220b88..36df6722 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/front/service/impl/QrCodeServiceImpl.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/front/service/impl/QrCodeServiceImpl.java
@@ -3,6 +3,7 @@ package com.zbkj.crmeb.front.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.exception.CrmebException;
import com.utils.CrmebUtil;
+import com.utils.QRCodeUtil;
import com.utils.RestTemplateUtil;
import com.zbkj.crmeb.front.service.QrCodeService;
import com.zbkj.crmeb.wechat.service.WeChatService;
@@ -71,5 +72,24 @@ public class QrCodeServiceImpl implements QrCodeService {
map.put("code", base64Image);
return map;
}
+
+ /**
+ * 讲字符串转为QRcode
+ * @param text 待转换字符串
+ * @return QRcode base64格式
+ */
+ @Override
+ public Map base64String(String text,int width, int height) {
+
+ String base64Image = null;
+ try {
+ base64Image = QRCodeUtil.crateQRCode(text,width,height);
+ }catch (Exception e){
+ throw new CrmebException("生成二维码异常");
+ }
+ Map map = new HashMap<>();
+ map.put("code", base64Image);
+ return map;
+ }
}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/front/service/impl/UserCenterServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/front/service/impl/UserCenterServiceImpl.java
index cba05542..dcaf5115 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/front/service/impl/UserCenterServiceImpl.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/front/service/impl/UserCenterServiceImpl.java
@@ -40,6 +40,8 @@ import com.zbkj.crmeb.wechat.response.WeChatAuthorizeLoginGetOpenIdResponse;
import com.zbkj.crmeb.wechat.response.WeChatAuthorizeLoginUserInfoResponse;
import com.zbkj.crmeb.wechat.response.WeChatProgramAuthorizeLoginGetOpenIdResponse;
import com.zbkj.crmeb.wechat.service.WeChatService;
+import com.zbkj.crmeb.wechat.service.impl.WechatSendMessageForMinService;
+import com.zbkj.crmeb.wechat.vo.WechatSendMessageForTopped;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -98,6 +100,9 @@ public class UserCenterServiceImpl extends ServiceImpl implements
@Autowired
private WeChatService weChatService;
+ @Autowired
+ private WechatSendMessageForMinService wechatSendMessageForMinService;
+
/**
@@ -425,8 +430,9 @@ public class UserCenterServiceImpl extends ServiceImpl implements
request.setGivePrice(systemGroupData.getGiveMoney());
}
+ User currentUser = userService.getInfoException();
//生成系统订单
- request.setUserId(userService.getUserIdException());
+ request.setUserId(currentUser.getUid());
UserRecharge userRecharge = userRechargeService.create(request);
@@ -436,6 +442,13 @@ public class UserCenterServiceImpl extends ServiceImpl implements
if(null == responseVo){
throw new CrmebException("下单失败！");
}
+ // 小程序订阅通知 充值成功通知
+ WechatSendMessageForTopped topped = new WechatSendMessageForTopped(
+ userRecharge.getOrderId(),userRecharge.getOrderId(),userRecharge.getPrice()+"",
+ currentUser.getNowMoney()+"",userRecharge.getCreateTime()+"", userRecharge.getGivePrice()+"",
+ "暂无",userRecharge.getPrice()+"","CRMEB","微信"
+ );
+ wechatSendMessageForMinService.sendToppedMessage(topped, currentUser.getUid());
return weChatService.response(responseVo);
}catch (Exception e){
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/marketing/service/StoreCouponUserService.java b/crmeb/src/main/java/com/zbkj/crmeb/marketing/service/StoreCouponUserService.java
index 30e86be6..3a905a1e 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/marketing/service/StoreCouponUserService.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/marketing/service/StoreCouponUserService.java
@@ -35,6 +35,15 @@ public interface StoreCouponUserService extends IService {
boolean use(Integer id, List productIdList, BigDecimal price);
+ /**
+ * 检测优惠券是否可用，计算订单价格时使用
+ * @param id 优惠券id
+ * @param productIdList 商品id集合
+ * @param price 价格
+ * @return 可用状态
+ */
+ boolean canUse(Integer id, List productIdList, BigDecimal price);
+
boolean receiveAll(UserCouponReceiveRequest request, Integer userId, String type);
boolean rollbackByCancelOrder(StoreOrder storeOrder);
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/marketing/service/impl/StoreCouponUserServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/marketing/service/impl/StoreCouponUserServiceImpl.java
index 315f2c3d..3fc4929d 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/marketing/service/impl/StoreCouponUserServiceImpl.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/marketing/service/impl/StoreCouponUserServiceImpl.java
@@ -197,7 +197,10 @@ public class StoreCouponUserServiceImpl extends ServiceImpl uidList) {
LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>();
- lambdaQueryWrapper.eq(StoreCouponUser::getCouponId, couponId).in(StoreCouponUser::getUid, uidList);
+ lambdaQueryWrapper
+ .eq(StoreCouponUser::getCouponId, couponId)
+ .in(StoreCouponUser::getUid, uidList)
+ .eq(StoreCouponUser::getStatus,0);
List storeCouponUserList = dao.selectList(lambdaQueryWrapper);
if(storeCouponUserList != null){
List receiveUidList = storeCouponUserList.stream().map(StoreCouponUser::getUid).distinct().collect(Collectors.toList());
@@ -285,6 +288,67 @@ public class StoreCouponUserServiceImpl extends ServiceImpl productIdList, BigDecimal price) {
+ StoreCouponUser storeCouponUser = getById(id);
+ if(storeCouponUser == null || !storeCouponUser.getUid().equals(userService.getUserIdException())){
+ throw new CrmebException("领取记录不存在！");
+ }
+
+ if(storeCouponUser.getStatus() == 1){
+ throw new CrmebException("此优惠券已使用！");
+ }
+
+ if(storeCouponUser.getStatus() == 2){
+ throw new CrmebException("此优惠券已失效！");
+ }
+
+ //判断是否在使用时间内
+ Date date = DateUtil.nowDateTime();
+ if(storeCouponUser.getStartTime().compareTo(date) > 0){
+ throw new CrmebException("此优惠券还未到达使用时间范围之内！");
+ }
+
+ if(date.compareTo(storeCouponUser.getEndTime()) > 0){
+ throw new CrmebException("此优惠券已经失效了");
+ }
+
+ if(storeCouponUser.getMinPrice().compareTo(price) > 0){
+ throw new CrmebException("总金额小于优惠券最小使用金额");
+ }
+
+ //检测优惠券信息
+ if(storeCouponUser.getUseType() > 1){
+ if(productIdList.size() < 1){
+ throw new CrmebException("没有找到商品");
+ }
+
+ //拿出需要使用优惠券的商品分类集合
+ List categoryIdList = storeProductService.getSecondaryCategoryByProductId(StringUtils.join(productIdList, ","));
+
+ //设置优惠券所提供的集合
+ List primaryKeyIdList = CrmebUtil.stringToArray(storeCouponUser.getPrimaryKey());
+
+ //取两个集合的交集，如果是false则证明没有相同的值
+ if(storeCouponUser.getUseType() == 2 && !primaryKeyIdList.retainAll(productIdList)){
+ throw new CrmebException("此优惠券为商品券，请购买相关商品之后再使用！");
+ }
+
+ if(storeCouponUser.getUseType() == 3 && !primaryKeyIdList.retainAll(categoryIdList)){
+ throw new CrmebException("此优惠券为分类券，请购买相关分类下的商品之后再使用！");
+ }
+ }
+ return true;
+ }
+
/**
* 用户批量领取优惠券
* @param request UserCouponReceiveRequest 领取参数
@@ -393,7 +457,7 @@ public class StoreCouponUserServiceImpl extends ServiceImpl getListByCartIds(List cartIds) {
//购物车产品集合
- List storeCartResponseList = storeCartService.getListByUserIdAndCartIds(userService.getUserIdException(), cartIds);
+ List storeCartResponseList = storeCartService.getListByUserIdAndCartIds(userService.getUserIdException(), cartIds,1);
//产品id集合
List productIds = storeCartResponseList.stream().map(StoreCartResponse::getProductId).distinct().collect(Collectors.toList());
@@ -424,6 +488,12 @@ public class StoreCouponUserServiceImpl extends ServiceImpl getListFront(Integer userId, PageParamRequest pageParamRequest) {
StoreCouponUserSearchRequest request = new StoreCouponUserSearchRequest();
@@ -446,7 +516,7 @@ public class StoreCouponUserServiceImpl extends ServiceImpl 0){
+ if(date.compareTo(storeCouponUserResponse.getEndTime()) >= 0){
type = false;
}
}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/payment/service/impl/CallbackServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/payment/service/impl/CallbackServiceImpl.java
index 97f21d05..922543fc 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/payment/service/impl/CallbackServiceImpl.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/payment/service/impl/CallbackServiceImpl.java
@@ -71,9 +71,14 @@ public class CallbackServiceImpl implements CallbackService {
AttachVo attachVo = JSONObject.toJavaObject(JSONObject.parseObject(callbackVo.getAttach()), AttachVo.class);
//判断openid
- UserToken userToken = userTokenService.getUserIdByOpenId(callbackVo.getOpenid());
+ UserToken userToken = userTokenService.getUserIdByOpenId(callbackVo.getOpenid(), Constants.THIRD_LOGIN_TOKEN_TYPE_PUBLIC); //公众号
if(null == userToken || !userToken.getUid().equals(attachVo.getUserId())){
- //用户信息错误
+ //继续找小程序，找不到说明没有
+ userToken = userTokenService.getUserIdByOpenId(callbackVo.getOpenid(), Constants.THIRD_LOGIN_TOKEN_TYPE_PROGRAM); //小程序
+ }
+
+ if(null == userToken || !userToken.getUid().equals(attachVo.getUserId())){
+ //用户信息错误
throw new CrmebException("用户信息错误！");
}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/payment/service/impl/OrderPayServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/payment/service/impl/OrderPayServiceImpl.java
index 78019db1..3c603757 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/payment/service/impl/OrderPayServiceImpl.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/payment/service/impl/OrderPayServiceImpl.java
@@ -19,6 +19,7 @@ import com.zbkj.crmeb.store.service.StoreOrderInfoService;
import com.zbkj.crmeb.store.service.StoreOrderService;
import com.zbkj.crmeb.store.service.StoreOrderStatusService;
import com.zbkj.crmeb.store.service.StoreProductCouponService;
+import com.zbkj.crmeb.store.utilService.OrderUtils;
import com.zbkj.crmeb.store.vo.StoreOrderInfoVo;
import com.zbkj.crmeb.user.model.User;
import com.zbkj.crmeb.user.model.UserBill;
@@ -26,8 +27,10 @@ import com.zbkj.crmeb.user.service.UserBillService;
import com.zbkj.crmeb.user.service.UserService;
import com.zbkj.crmeb.wechat.service.TemplateMessageService;
import com.zbkj.crmeb.wechat.service.WeChatService;
+import com.zbkj.crmeb.wechat.vo.WechatSendMessageForPaySuccess;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -88,6 +91,9 @@ public class OrderPayServiceImpl extends PayService implements OrderPayService {
@Autowired
private WeChatService weChatService;
+ @Autowired
+ private OrderUtils orderUtils;
+
//订单类
private StoreOrder order;
@@ -105,7 +111,6 @@ public class OrderPayServiceImpl extends PayService implements OrderPayService {
*/
@Override
public CreateOrderResponseVo payOrder(Integer orderId, String fromType, String clientIp) {
- // todo 这里需要根据 fromType 参数直接替换当前支付方式，
CreateOrderResponseVo responseVo = new CreateOrderResponseVo();
StoreOrder storeOrder = storeOrderService.getById(orderId);
setOrder(storeOrder);
@@ -299,20 +304,28 @@ public class OrderPayServiceImpl extends PayService implements OrderPayService {
* @since 2020-07-01
*/
private void pushTempMessage() {
- String tempKey = Constants.WE_CHAT_PUBLIC_TEMP_KEY_ORDER_PAY_SUCCESS;
- String type = Constants.PAY_TYPE_WE_CHAT_FROM_PUBLIC;
- if(Constants.ORDER_PAY_CHANNEL_PROGRAM == getOrder().getIsChannel()){
- tempKey = Constants.WE_CHAT_PROGRAM_TEMP_KEY_ORDER_PAY_SUCCESS;
- type = Constants.PAY_TYPE_WE_CHAT_FROM_PROGRAM;
- }
-
- HashMap map = new HashMap<>();
- map.put(Constants.WE_CHAT_TEMP_KEY_FIRST, "订单支付成功");
- map.put("orderId", getOrder().getOrderId());
- map.put("payAmount", getOrder().getPayPrice().toString());
- map.put(Constants.WE_CHAT_TEMP_KEY_END, "感谢购买！");
+// String tempKey = Constants.WE_CHAT_PUBLIC_TEMP_KEY_ORDER_PAY_SUCCESS;
+// String type = Constants.PAY_TYPE_WE_CHAT_FROM_PUBLIC;
+// if(Constants.ORDER_PAY_CHANNEL_PROGRAM == getOrder().getIsChannel()){
+// tempKey = Constants.WE_CHAT_PROGRAM_TEMP_KEY_ORDER_PAY_SUCCESS;
+// type = Constants.PAY_TYPE_WE_CHAT_FROM_PROGRAM;
+// }
+//
+// HashMap map = new HashMap<>();
+// map.put(Constants.WE_CHAT_TEMP_KEY_FIRST, "订单支付成功");
+// map.put("orderId", getOrder().getOrderId());
+// map.put("payAmount", getOrder().getPayPrice().toString());
+// map.put(Constants.WE_CHAT_TEMP_KEY_END, "感谢购买！");
// templateMessageService.push(tempKey, map, getOrder().getUid(), type);
+ // 小程序发送订阅消息
+ String storeNameAndCarNumString = orderUtils.getStoreNameAndCarNumString(getOrder().getId());
+ if(StringUtils.isNotBlank(storeNameAndCarNumString)){
+ WechatSendMessageForPaySuccess paySuccess = new WechatSendMessageForPaySuccess(
+ getOrder().getId()+"",getOrder().getPayPrice()+"",getOrder().getPayTime()+"","暂无",
+ getOrder().getTotalPrice()+"",storeNameAndCarNumString);
+ orderUtils.sendWeiChatMiniMessageForPaySuccess(paySuccess, userService.getById(getOrder()).getUid());
+ }
}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/pub/controller/WeChatPushController.java b/crmeb/src/main/java/com/zbkj/crmeb/pub/controller/WeChatPushController.java
index 62918223..86508c13 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/pub/controller/WeChatPushController.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/pub/controller/WeChatPushController.java
@@ -3,6 +3,7 @@ package com.zbkj.crmeb.pub.controller;
import com.alibaba.fastjson.JSONObject;
import com.common.CommonResult;
import com.utils.RestTemplateUtil;
+import com.zbkj.crmeb.system.service.SystemAdminService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -34,6 +35,9 @@ public class WeChatPushController {
@Resource
private RestTemplateUtil restTemplateUtil;
+ @Resource
+ private SystemAdminService systemAdminService;
+
/**
* 新增后台管理员表
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/sms/controller/SmsRecordController.java b/crmeb/src/main/java/com/zbkj/crmeb/sms/controller/SmsRecordController.java
index 11205a5e..7b1eb81e 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/sms/controller/SmsRecordController.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/sms/controller/SmsRecordController.java
@@ -5,25 +5,19 @@ import com.common.CommonPage;
import com.common.CommonResult;
import com.common.PageParamRequest;
import com.constants.SmsConstants;
-import com.exception.CrmebException;
-import com.utils.ValidateCodeUtil;
import com.utils.ValidateFormUtil;
+import com.zbkj.crmeb.sms.model.SmsRecord;
import com.zbkj.crmeb.sms.request.RegisterRequest;
-import com.zbkj.crmeb.sms.request.SmsConfigRequest;
import com.zbkj.crmeb.sms.request.SmsLoginRequest;
import com.zbkj.crmeb.sms.request.SmsRecordRequest;
+import com.zbkj.crmeb.sms.service.SmsRecordService;
import com.zbkj.crmeb.sms.service.SmsService;
-import com.zbkj.crmeb.validatecode.model.ValidateCode;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
-import com.zbkj.crmeb.sms.service.SmsRecordService;
-import com.zbkj.crmeb.sms.model.SmsRecord;
import java.math.BigDecimal;
-import java.util.HashMap;
/**
@@ -247,36 +241,16 @@ public class SmsRecordController {
@ApiImplicitParams({
@ApiImplicitParam(name="title", value="名称"),
@ApiImplicitParam(name="status", value="状态"),
+ @ApiImplicitParam(name="type", value="type (1=验证码 2=通知 3=推广)"),
})
public CommonResult tempList(@RequestParam(name = "status", required = false) Integer status,
@RequestParam(name = "title", required = false) String title,
+ @RequestParam(name = "type", required = false) String type,
@ModelAttribute PageParamRequest pageParamRequest){
- JSONObject result = smsService.tempList(title, status, pageParamRequest);
+ JSONObject result = smsService.tempList(title, status, type, pageParamRequest);
return CommonResult.success(getDataByResult(result));
}
- /**
- * 短信提醒开关
- * @param request
- * @return
- */
- @ApiOperation(value = "短信提醒开关保存")
- @RequestMapping(value = "/config/save", method = RequestMethod.POST)
- public CommonResult
阿达萨
啦啦啦
![](\"image/product/2020/07/27/b1fce51995e340498d949654bdafec20nxx9op0cuv.jpg\"/)
![](\"image/product/2020/07/07/5375ccfcb8254ae28478a11285e240afmgs4zqtjo1.png\"/)