r
/
hangtag
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.yfgame.vip/r/hangtag into dev 

# Conflicts:
#	hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/productinfo/ProductInfoController.java
This commit is contained in:
YuanFeng 2024-11-19 22:12:16 +08:00
parent 69799f3705 8df7c5e026
commit 1b122b0fb7
7 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
View File

@ -50,8 +50,10 @@ import cn.hangtag.module.oms.service.product.ProductPriceService;
import cn.hangtag.module.oms.service.productinfo.ProductInfoService;
import cn.hangtag.module.oms.service.salecontract.SaleContractService;
import cn.hangtag.module.oms.service.saleordersku.SaleOrderSkuService;
import cn.hangtag.module.system.dal.dataobject.user.AdminUserDO;
import cn.hangtag.module.system.mq.message.mail.MailSendMessage;
import cn.hangtag.module.system.service.mail.MailSendService;
import cn.hangtag.module.system.service.user.AdminUserService;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
@ -130,6 +132,9 @@ public class SaleOrderServiceImpl implements SaleOrderService {
@Resource
private MailSendService mailSendService;
@Resource
private AdminUserService adminUserService;
@Value("${oms.partyb}")
private String partyb;
@ -372,6 +377,18 @@ public class SaleOrderServiceImpl implements SaleOrderService {
message.setMail(emails);
message.setTitle("OMS订单系统");
message.setContent("您好，您的订单："+saleOrder.getBillno()+"，已审核通过！");
mailSendService.doSendMail(message);
}
String orderFollowerUser = saleOrder.getOrderFollowerUser();
if(StringUtils.isNotBlank(orderFollowerUser)){
AdminUserDO user = adminUserService.getUser(Long.valueOf(orderFollowerUser));
String email = user.getEmail();
MailSendMessage message = new MailSendMessage();
message.setAccountId(1L);
message.setMail(email);
message.setTitle("OMS订单系统");
message.setContent("您好，订单："+saleOrder.getBillno()+"，已审核通过！");
mailSendService.doSendMail(message,new File(pdfPath));
}
}

4
hangtag-ui/hangtag-ui-admin/src/views/Login/Login.vue
View File

@ -29,7 +29,7 @@
</div>
<div class="relative flex-1 p-30px dark:bg-[var(--login-bg-color)] lt-sm:p-10px">
<!-- 右上角的主题、语言选择 -->
<div
<!-- <div
class="flex items-center justify-between text-white at-2xl:justify-end at-xl:justify-end"
>
<div class="flex items-center at-2xl:hidden at-xl:hidden">
@ -40,7 +40,7 @@
<ThemeSwitch />
<LocaleDropdown class="dark:text-white lt-xl:text-white" />
</div>
</div>
</div>-->
<!-- 右边的登录界面 -->
<Transition appear enter-active-class="animate__animated animate__bounceInRight">
<div

4
hangtag-ui/hangtag-ui-admin/src/views/Login/SocialLogin.vue
View File

@ -29,7 +29,7 @@
</div>
<div class="relative flex-1 p-30px dark:bg-[var(--login-bg-color)] lt-sm:p-10px">
<!-- 右上角的主题、语言选择 -->
<div
<!-- <div
class="flex items-center justify-between text-white at-2xl:justify-end at-xl:justify-end"
>
<div class="flex items-center at-2xl:hidden at-xl:hidden">
@ -40,7 +40,7 @@
<ThemeSwitch />
<LocaleDropdown class="dark:text-white lt-xl:text-white" />
</div>
</div>
</div>-->
<!-- 右边的登录界面 -->
<Transition appear enter-active-class="animate__animated animate__bounceInRight">
<div

4
hangtag-ui/hangtag-ui-front/src/views/Login/Login.vue
View File

@ -29,7 +29,7 @@
</div>
<div class="relative flex-1 p-30px dark:bg-[var(--login-bg-color)] lt-sm:p-10px">
<!-- 右上角的主题、语言选择 -->
<div
<!-- <div
class="flex items-center justify-between text-white at-2xl:justify-end at-xl:justify-end"
>
<div class="flex items-center at-2xl:hidden at-xl:hidden">
@ -40,7 +40,7 @@
<ThemeSwitch />
<LocaleDropdown class="dark:text-white lt-xl:text-white" />
</div>
</div>
</div>-->
<!-- 右边的登录界面 -->
<Transition appear enter-active-class="animate__animated animate__bounceInRight">
<div

4
hangtag-ui/hangtag-ui-front/src/views/Login/SocialLogin.vue
View File

@ -29,7 +29,7 @@
</div>
<div class="relative flex-1 p-30px dark:bg-[var(--login-bg-color)] lt-sm:p-10px">
<!-- 右上角的主题、语言选择 -->
<div
<!-- <div
class="flex items-center justify-between text-white at-2xl:justify-end at-xl:justify-end"
>
<div class="flex items-center at-2xl:hidden at-xl:hidden">
@ -40,7 +40,7 @@
<ThemeSwitch />
<LocaleDropdown class="dark:text-white lt-xl:text-white" />
</div>
</div>
</div>-->
<!-- 右边的登录界面 -->
<Transition appear enter-active-class="animate__animated animate__bounceInRight">
<div

4
hangtag-ui/hangtag-ui-front/src/views/Login/components/LoginForm.vue
View File

@ -187,8 +187,8 @@ const loginData = reactive({
tenantName: '芋道源码',
username: '',
password: '',
// todo type: '999999',
type: '',
type: '999999',
//type: '',
captchaVerification: '',
rememberMe: true // 默认记录我。如果不需要，可手动修改
}

6
hangtag-ui/hangtag-ui-front/src/views/oms/saleorder/index.vue
View File

@ -237,7 +237,7 @@
<el-table-column label="操作" align="center" width="150" fixed="right">
<template #default="scope">
<router-link :to="'/order/createorder?id='+scope.row.id+'&_t=2'">
<router-link :to="'/order/createorder?id='+scope.row.id+'&_t=2'" v-if="scope.row.billStatus == 'B' ">
<el-button
link
type="primary">
@ -246,7 +246,7 @@
</el-button>
</router-link>
<el-button
<!-- <el-button
link
type="primary"
@click="openEdit(scope.row.id)"
@ -254,7 +254,7 @@
>
<Icon icon="ep:edit" />
编辑
</el-button>
</el-button>-->
<el-button
link
type="primary"