zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product

pull/2/head
js199000126 2023-05-25 17:22:50 +08:00
parent 712c0b1580 51581f66a6
commit 9cf17dc717
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesServiceImpl.java
View File

@ -96,6 +96,7 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl<ShippingTemplatesM
shippingTemplatesDO.setSort(request.getSort()); shippingTemplatesDO.setSort(request.getSort());
shippingTemplatesDO.setType(request.getType()); shippingTemplatesDO.setType(request.getType());
shippingTemplatesDO.setDeleted(false); shippingTemplatesDO.setDeleted(false);
shippingTemplatesDO.setNoDelivery(request.getNoDelivery());
shippingTemplatesDO.setAppoint(request.getAppoint()); shippingTemplatesDO.setAppoint(request.getAppoint());
save(shippingTemplatesDO); save(shippingTemplatesDO);
@ -110,7 +111,7 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl<ShippingTemplatesM
} }
ShippingTemplatesNoDeliveryRespVO shippingTemplatesNoDeliveryRespVO = request.getShippingTemplatesNoDeliveryRespVOS(); ShippingTemplatesNoDeliveryRespVO shippingTemplatesNoDeliveryRespVO = request.getShippingTemplatesNoDeliveryRespVOS();
if(!ObjectUtil.isNull(shippingTemplatesNoDeliveryRespVO)){ if(!ObjectUtil.isNull(shippingTemplatesNoDeliveryRespVO) && request.getNoDelivery()){
shippingTemplatesNoDeliveryService.saveAll(shippingTemplatesNoDeliveryRespVO, shippingTemplatesDO.getId()); shippingTemplatesNoDeliveryService.saveAll(shippingTemplatesNoDeliveryRespVO, shippingTemplatesDO.getId());
} }
@ -140,7 +141,7 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl<ShippingTemplatesM
} }
/** /**
* 新增 * 修改
* @param id Integer 模板id * @param id Integer 模板id
* @param request ShippingTemplatesRequest 新增参数 * @param request ShippingTemplatesRequest 新增参数
*/ */
@ -152,6 +153,7 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl<ShippingTemplatesM
shippingTemplatesDO.setSort(request.getSort()); shippingTemplatesDO.setSort(request.getSort());
shippingTemplatesDO.setType(request.getType()); shippingTemplatesDO.setType(request.getType());
shippingTemplatesDO.setAppoint(request.getAppoint()); shippingTemplatesDO.setAppoint(request.getAppoint());
shippingTemplatesDO.setNoDelivery(request.getNoDelivery());
updateById(shippingTemplatesDO); updateById(shippingTemplatesDO);
@ -166,7 +168,7 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl<ShippingTemplatesM
List<ShippingTemplatesFreeRespVO> shippingTemplatesFreeRespVOList = request.getShippingTemplatesFreeRespVOList(); List<ShippingTemplatesFreeRespVO> shippingTemplatesFreeRespVOList = request.getShippingTemplatesFreeRespVOList();
if(CollUtil.isNotEmpty(shippingTemplatesFreeRespVOList) && request.getAppoint()){ if(CollUtil.isNotEmpty(shippingTemplatesFreeRespVOList) && request.getAppoint()){
shippingTemplatesFreeService.saveAll(shippingTemplatesFreeRespVOList, request.getType(), shippingTemplatesDO.getId()); shippingTemplatesFreeService.saveAll(shippingTemplatesFreeRespVOList, request.getType(), id);
} }
ShippingTemplatesNoDeliveryRespVO shippingTemplatesNoDeliveryRespVO= request.getShippingTemplatesNoDeliveryRespVOS(); ShippingTemplatesNoDeliveryRespVO shippingTemplatesNoDeliveryRespVO= request.getShippingTemplatesNoDeliveryRespVOS();
if(ObjectUtil.isNotNull(shippingTemplatesNoDeliveryRespVO)){ if(ObjectUtil.isNotNull(shippingTemplatesNoDeliveryRespVO)){

2
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java
View File

@ -1464,7 +1464,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
}); });
List<PhoneRecordDO> infoDOS = phoneRecordMapper.selectList(Wrappers.<PhoneRecordDO>lambdaQuery() List<PhoneRecordDO> infoDOS = phoneRecordMapper.selectList(Wrappers.<PhoneRecordDO>lambdaQuery()
.eq(PhoneRecordDO::getPhone, user.getMobile()) .eq(PhoneRecordDO::getPhone, request.getUserPhone())
.eq(PhoneRecordDO::getDeleted, 0) .eq(PhoneRecordDO::getDeleted, 0)
.in(PhoneRecordDO::getRechargeGearId, collect)); .in(PhoneRecordDO::getRechargeGearId, collect));

7
yudao-ui-app/pages/user/index.vue
View File

@ -95,7 +95,7 @@
@click="jumpPage('/pages/users/user_spread_code/index')"> @click="jumpPage('/pages/users/user_spread_code/index')">
<u-icon slot="icon" size="45" name="/static/images/user_icon2.png"></u-icon> <u-icon slot="icon" size="45" name="/static/images/user_icon2.png"></u-icon>
</u-cell> </u-cell>
<u-cell title="热线电话" value="023-12948338" :value="tenantInfo.serviceMobile" isLink> <u-cell title="热线电话" value="023-12948338" :value="tenantInfo.serviceMobile" isLink @click="callPhone">
<u-icon slot="icon" size="45" name="/static/images/user_icon3.png"></u-icon> <u-icon slot="icon" size="45" name="/static/images/user_icon3.png"></u-icon>
</u-cell> </u-cell>
<u-cell title="在线客服" value="8:30-17:30" :value="tenantInfo.serviceTime" isLink @click="kefuClick"> <u-cell title="在线客服" value="8:30-17:30" :value="tenantInfo.serviceTime" isLink @click="kefuClick">
@ -254,6 +254,11 @@
url: url url: url
}) })
}, },
callPhone() {
if(this.tenantInfo.serviceMobile){
window.location.href = `tel:${this.tenantInfo.serviceMobile}`
}
},
kefuClick() { kefuClick() {
if (this.tenantInfo.wxKfUrl) { if (this.tenantInfo.wxKfUrl) {
location.href = this.tenantInfo.wxKfUrl location.href = this.tenantInfo.wxKfUrl