From 92d425f57c81d297a934372f2db0cde2ada00a54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com> Date: Fri, 24 Nov 2023 17:24:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E7=A0=81=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EventMarketing/cardFavorable/index.vue | 12 ++-- fuintBackend/fuint-application/pom.xml | 12 ++++ .../impl/ActiveExchangeServiceImpl.java | 27 ++++++++- .../impl/CardExchangeRecordServiceImpl.java | 19 +++++- .../fuint/common/shiroConfig/ShiroConfig.java | 2 + .../java/com/fuint/common/util/SMSUtils.java | 38 ++++++++++++ .../fuint/common/util/ValidateCodeUtils.java | 49 +++++++++++++++ .../controller/BackendLoginController.java | 59 +++++++++++++++++-- 8 files changed, 204 insertions(+), 14 deletions(-) create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/common/util/SMSUtils.java create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/common/util/ValidateCodeUtils.java diff --git a/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue b/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue index 03568b261..d34c423ef 100644 --- a/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue +++ b/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue @@ -85,12 +85,12 @@ 领券后第{{ scope.row.validityDay}}天生效 - + @@ -218,20 +218,20 @@ - + + {{city}} diff --git a/fuintBackend/fuint-application/pom.xml b/fuintBackend/fuint-application/pom.xml index d6240ec4d..7c59148f2 100644 --- a/fuintBackend/fuint-application/pom.xml +++ b/fuintBackend/fuint-application/pom.xml @@ -165,6 +165,18 @@ 1.4 + + + com.aliyun + aliyun-java-sdk-core + 4.5.16 + + + com.aliyun + aliyun-java-sdk-dysmsapi + 2.1.0 + + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java index 3d4b32e17..acd286dc7 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java @@ -28,6 +28,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -161,7 +162,9 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { MaxoutVO maxoutVO = new MaxoutVO(); // 会员等级判断、符合油号判断 if (activeFullminus.getDieselUserLevel().contains(String.valueOf(userGradeService.selectUserGradeById(transferDTO.getGradeId()).getId())) && - activeFullminus.getAdaptOil().contains(String.valueOf(transferDTO.getOilName()))){ + activeFullminus.getAdaptOil().contains(String.valueOf(transferDTO.getOilName())) && + activeFullminus.getActiveStartTime().getTime()<=new Date().getTime() && + new Date().getTime()<=activeFullminus.getActiveEndTime().getTime()){ BeanUtils.copyProperties(activeFullminus,maxoutVO); LambdaQueryWrapper queryWrappers = new LambdaQueryWrapper<>(); queryWrappers.eq(ActiveDiscountChild::getActiveFullminusId,activeFullminus.getId()); @@ -186,7 +189,9 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { MaxoutVO maxoutVO = new MaxoutVO(); // 会员等级判断、符合油号判断 if (activeDiscount.getDieselUserLevel().contains(String.valueOf(userGradeService.selectUserGradeById(transferDTO.getGradeId()).getId())) && - activeDiscount.getAdaptOil().contains(String.valueOf(transferDTO.getOilName()))){ + activeDiscount.getAdaptOil().contains(String.valueOf(transferDTO.getOilName()))&& + activeDiscount.getActiveStartTime().getTime()<=new Date().getTime() && + new Date().getTime()<=activeDiscount.getActiveEndTime().getTime()){ BeanUtils.copyProperties(activeDiscount,maxoutVO); LambdaQueryWrapper queryWrappers = new LambdaQueryWrapper<>(); queryWrappers.eq(ActiveDiscountChild::getActiveDiscountId,activeDiscount.getId()); @@ -218,7 +223,23 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { cardFavorableLambdaQueryWrapper.le(CardFavorable::getSatisfiedAmount,transferDTO.getOilPrice() * transferDTO.getOilLiters()); List list1 = cardFavorableService.list(cardFavorableLambdaQueryWrapper); if (list1.size()>0){ - BeanUtils.copyProperties(list1.get(0), exchangeFavorableVO); + CardFavorable cardFavorable = list1.get(0); + if (cardFavorable.getTimeType().equals("0") && + new Date().getTime()<=cardFavorable.getCreateTime().getTime()+ 86400000L * cardFavorable.getValidityZero() ){ + BeanUtils.copyProperties(cardFavorable, exchangeFavorableVO); + } + if (cardFavorable.getTimeType().equals("1") && + new Date().getTime()<=cardFavorable.getEffectiveDate().getTime()+ 86400000L * cardFavorable.getValidityOne() ){ + BeanUtils.copyProperties(cardFavorable, exchangeFavorableVO); + } + if (cardFavorable.getTimeType().equals("2") && + new Date().getTime() >= cardFavorable.getCreateTime().getTime() + Integer.parseInt(cardFavorable.getValidityDay()) * 86400000L && + new Date().getTime() <= cardFavorable.getCreateTime().getTime() + Integer.parseInt(cardFavorable.getValidityDay()) * 86400000L + 86400000L * cardFavorable.getValidityTwo()){ + BeanUtils.copyProperties(cardFavorable, exchangeFavorableVO); + } + /*if (){ + + }*/ exchangeFavorableVOArrayList.add(exchangeFavorableVO); } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/service/impl/CardExchangeRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/service/impl/CardExchangeRecordServiceImpl.java index ad4a7f6fb..d9fa321ac 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/service/impl/CardExchangeRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/service/impl/CardExchangeRecordServiceImpl.java @@ -7,9 +7,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fuint.business.marketingActivity.cardExchange.mapper.CardExchangeRecordMapper; import com.fuint.business.marketingActivity.cardExchange.entity.CardExchangeRecord; import com.fuint.business.marketingActivity.cardExchange.service.CardExchangeRecordService; +import com.fuint.business.store.service.StoreService; +import com.fuint.common.util.TokenUtil; import org.apache.commons.lang3.ObjectUtils; import org.springframework.stereotype.Service; +import javax.annotation.Resource; + /** * 兑换券领取记录表(CardExchangeRecord)表服务实现类 * @@ -18,7 +22,8 @@ import org.springframework.stereotype.Service; */ @Service("cardExchangeRecordService") public class CardExchangeRecordServiceImpl extends ServiceImpl implements CardExchangeRecordService { - + @Resource + private StoreService storeService; /** * 分页查询 * @param page @@ -27,6 +32,11 @@ public class CardExchangeRecordServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); if(ObjectUtils.isNotEmpty(cardExchangeRecord.getExchangeName())){ @@ -41,6 +51,7 @@ public class CardExchangeRecordServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); if(ObjectUtils.isNotEmpty(cardExchangeRecord.getExchangeName())){ @@ -70,6 +86,7 @@ public class CardExchangeRecordServiceImpl extends ServiceImpl filterMap=new LinkedHashMap<>(); filterMap.put("/backendApi/login/doLogin","anon"); + filterMap.put("/backendApi/login/sendMsg","anon"); filterMap.put("/clientApi/captcha/getCode","anon"); + filterMap.put("/backendApi/login/loginByPhone","anon"); filterMap.put("/static/**","anon"); //会员模板导出 filterMap.put("/excel/export","anon"); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/util/SMSUtils.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/util/SMSUtils.java new file mode 100644 index 000000000..05853e4b6 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/util/SMSUtils.java @@ -0,0 +1,38 @@ +package com.fuint.common.util; + +import com.aliyuncs.DefaultAcsClient; +import com.aliyuncs.IAcsClient; +import com.aliyuncs.dysmsapi.model.v20170525.SendSmsRequest; +import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse; +import com.aliyuncs.exceptions.ClientException; +import com.aliyuncs.profile.DefaultProfile; + +/** + * 短信发送工具类 + */ +public class SMSUtils { + /** + * 发送短信 + * @param signName 签名 + * @param templateCode 模板 + * @param phoneNumbers 手机号 + * @param param 参数 + */ + public static void sendMessage(String signName, String templateCode,String phoneNumbers,String param){ + DefaultProfile profile = DefaultProfile.getProfile("cn-hangzhou", "", ""); + IAcsClient client = new DefaultAcsClient(profile); + + SendSmsRequest request = new SendSmsRequest(); + request.setSysRegionId("cn-hangzhou"); + request.setPhoneNumbers(phoneNumbers); + request.setSignName(signName); + request.setTemplateCode(templateCode); + request.setTemplateParam("{\"code\":\""+param+"\"}"); + try { + SendSmsResponse response = client.getAcsResponse(request); + System.out.println("短信发送成功"+response); + }catch (ClientException e) { + e.printStackTrace(); + } + } +} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/util/ValidateCodeUtils.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/util/ValidateCodeUtils.java new file mode 100644 index 000000000..653f8829b --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/util/ValidateCodeUtils.java @@ -0,0 +1,49 @@ +package com.fuint.common.util; + +import java.util.Random; + +public class ValidateCodeUtils { + + /** + * 随机生成验证码 + * @param a + * @return + */ + public static String verificationCode(int a) { +// 定义一个空字符串 + String verification_code = ""; +// 创建Random对象 + Random r = new Random(); + for (int i = 0; i < a; i++) { +// 确定字符类型(0代表数字，1代表大写字母，2代表小写字母) + int type = r.nextInt(3); + switch (type) { + case 0: +// 随机生成一个0~9数字 + verification_code += r.nextInt(10); + break; + case 1: +// 随机生成一个65~90的数字，然后强转为大写字母 + verification_code += (char) (r.nextInt(26) + 65); + break; + case 2: +// 随机生成一个97~122的数字，然后强转为小写字母 + verification_code += (char) (r.nextInt(26) + 97); + break; + } + } + return verification_code; + } + + /** + * 随机生成指定长度字符串验证码 + * @param length 长度 + * @return + */ + public static String generateValidateCode4String(int length){ + Random rdm = new Random(); + String hash1 = Integer.toHexString(rdm.nextInt()); + String capstr = hash1.substring(0, length); + return capstr; + } +} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendLoginController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendLoginController.java index a0cdf6737..ed678ab07 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendLoginController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendLoginController.java @@ -1,15 +1,17 @@ package com.fuint.module.backendApi.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.baomidou.mybatisplus.extension.api.R; import com.fuint.common.dto.AccountInfo; +import com.fuint.common.dto.UserDto; import com.fuint.common.enums.AdminRoleEnum; import com.fuint.common.service.*; -import com.fuint.common.util.TokenUtil; -import com.fuint.common.util.TreeUtil; +import com.fuint.common.util.*; import com.fuint.common.vo.RouterVo; import com.fuint.framework.annoation.OperationServiceLog; import com.fuint.framework.exception.BusinessCheckException; import com.fuint.module.backendApi.request.LoginRequest; -import com.fuint.common.util.Constants; import com.fuint.framework.web.BaseController; import com.fuint.framework.web.ResponseObject; import com.fuint.module.backendApi.response.LoginResponse; @@ -23,11 +25,15 @@ import io.swagger.annotations.ApiOperation; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.subject.Subject; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.web.bind.annotation.*; import com.fuint.common.domain.TreeNode; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; import java.util.*; +import java.util.concurrent.TimeUnit; /** * 后台登录接口 @@ -64,6 +70,9 @@ public class BackendLoginController extends BaseController { @Resource private CaptchaService captchaService; + @Autowired + public RedisTemplate redisTemplate; + /** * 后台登录 * */ @@ -110,8 +119,50 @@ public class BackendLoginController extends BaseController { } /** - * 获取登录信息接口 + * 后台登录 * */ + @ApiOperation(value = "发送手机验证码") + @RequestMapping(value="/sendMsg", method = RequestMethod.POST) + @OperationServiceLog(description = "发送手机验证码") + public ResponseObject sendMsg(@RequestBody UserDto userDto) { + //获取手机号 + String phone = userDto.getMobile(); + if(StringUtils.isNotEmpty(phone)){ + //生成随机的四位验证码 + String code = ValidateCodeUtils.verificationCode(4); + //调用阿里云提供的短信服务API完成发送短信 + SMSUtils.sendMessage("蓝鲸智慧油站","SMS_154950909",phone,code); + //需要将生成的验证码保存到redis,过期时间60s + redisTemplate.opsForValue().set(phone,code,60, TimeUnit.SECONDS); + return getSuccessResult("手机验证码发送成功"); + } + return getFailureResult("短信发送失败"); + } + + /** + * + * @param map + * @param session + * @return + */ + @PostMapping("/loginByPhone") + public ResponseObject loginByPhone(@RequestBody Map map) { + //获取手机号 1234 + String phone = map.get("mobile").toString(); + //获取验证码 + String code = map.get("code").toString(); + //从redis中获取保存的验证码 + Object codeInRedis = redisTemplate.opsForValue().get(phone); + //进行验证码的比对 + if (codeInRedis != null && codeInRedis.equals(code)) { + //如果能够比对成功，说明登录成功 + return getSuccessResult("登录成功!"); + } + return getFailureResult("登录失败，请输入正确的验证码"); + } + /** + * 获取登录信息接口 + * */ @ApiOperation(value = "获取登录信息") @RequestMapping(value = "/getInfo", method = RequestMethod.GET) public ResponseObject getInfo(HttpServletRequest request) throws BusinessCheckException { From f706797001821c98d9cea111590dea31fd920f16 Mon Sep 17 00:00:00 2001 From: wangh <9483> Date: Fri, 24 Nov 2023 17:59:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/convenienceStore/damage/details.vue | 2 +- .../convenienceStore/inventory/details.vue | 2 +- .../convenienceStore/inventory/index.vue | 4 +- .../convenienceStore/purchase/details.vue | 2 +- fuintAdmin/src/views/member/userInfo.vue | 41 +++++++++++++++---- .../src/views/oilConfig/oilGun/list.vue | 2 +- .../controller/MtPurchaseController.java | 12 +++++- .../mapper/xml/MtDamageDetailsMapper.xml | 1 + .../mapper/xml/MtPurchaseDetailsMapper.xml | 5 +-- .../service/impl/MtDamageServiceImpl.java | 2 +- .../service/impl/MtInventoryServiceImpl.java | 2 +- .../service/impl/MtPurchaseServiceImpl.java | 4 +- .../service/impl/MtReturnsServiceImpl.java | 2 +- .../impl/CardFuelRecordServiceImpl.java | 1 + .../impl/CardValueRecordServiceImpl.java | 3 ++ .../service/impl/OilTankServiceImpl.java | 16 +++++++- fuintCashierWeb/src/views/details/index.vue | 22 ++++++++-- 17 files changed, 96 insertions(+), 27 deletions(-) diff --git a/fuintAdmin/src/views/convenienceStore/damage/details.vue b/fuintAdmin/src/views/convenienceStore/damage/details.vue index 8fcbf7c98..c8fb07ad5 100644 --- a/fuintAdmin/src/views/convenienceStore/damage/details.vue +++ b/fuintAdmin/src/views/convenienceStore/damage/details.vue @@ -48,7 +48,7 @@ 保存 保存并审核 退货处理库存 - 作废 + 作废 导出 diff --git a/fuintAdmin/src/views/convenienceStore/inventory/details.vue b/fuintAdmin/src/views/convenienceStore/inventory/details.vue index 1c5f73811..00923a8ac 100644 --- a/fuintAdmin/src/views/convenienceStore/inventory/details.vue +++ b/fuintAdmin/src/views/convenienceStore/inventory/details.vue @@ -49,7 +49,7 @@ 保存 生成差异单 退货处理库存 - 作废 + 作废 导出 diff --git a/fuintAdmin/src/views/convenienceStore/inventory/index.vue b/fuintAdmin/src/views/convenienceStore/inventory/index.vue index 41904815e..df97be688 100644 --- a/fuintAdmin/src/views/convenienceStore/inventory/index.vue +++ b/fuintAdmin/src/views/convenienceStore/inventory/index.vue @@ -73,7 +73,7 @@ 待审核 已审核入库 已作废 - 已审核 + 已审核 @@ -246,6 +246,8 @@ export default { // 重置 resetQuery() { this.queryParams = {} + this.getList(); + }, // 删除 handleDel(data) { diff --git a/fuintAdmin/src/views/convenienceStore/purchase/details.vue b/fuintAdmin/src/views/convenienceStore/purchase/details.vue index 2df884907..7edb25ec6 100644 --- a/fuintAdmin/src/views/convenienceStore/purchase/details.vue +++ b/fuintAdmin/src/views/convenienceStore/purchase/details.vue @@ -50,7 +50,7 @@ 保存 保存并审核 进货并入库 - 作废 + 作废 导出 diff --git a/fuintAdmin/src/views/member/userInfo.vue b/fuintAdmin/src/views/member/userInfo.vue index ba0f394e0..9d2f0e85d 100644 --- a/fuintAdmin/src/views/member/userInfo.vue +++ b/fuintAdmin/src/views/member/userInfo.vue @@ -467,14 +467,14 @@ 升数卡充值不支持自定义积分,选择对应充值活动获得对应积分[需开启积分活动有效] - + @@ -519,7 +519,7 @@ -
付款金额
@@ -1021,7 +1021,11 @@ export default { }, valueAmoutChange(data) { + if(data == '' || data == null) { + data = 0 + this.cardValueForm.amount = 0 + } this.cardValueForm.points = '' this.cardValueForm.bidBalance ='' @@ -1105,6 +1109,15 @@ export default { this.cardValueForm.staffMobile= data.staffMobile }, + refStaff() { + this.cardFuelDieselForm.mtStaffId= '' + this.cardFuelDieselForm.realName= '' + this.cardFuelDieselForm.staffMobile= '' + + this.cardValueForm.mtStaffId= '' + this.cardValueForm.realName= '' + this.cardValueForm.staffMobile= '' + }, // 查询参加存油卡油品 getCountOilType() { getCountOilTypeApi().then(res => { @@ -1172,8 +1185,12 @@ export default { this.realyPayBills = this.cardFuelDieselForm.rechargeBalance } - this.isPay = true this.openConfirm = true; + this.isPay = true + + console.log("11111",this.isPay) + // this.isPaySuccess=false + this.title = this.payment }, // 支付方式 @@ -1230,8 +1247,9 @@ export default { this.cardValueForm.giftBalance = 0 this.cardValueForm.growthValue = 0 this.cardValueForm.bidBalance = 0 + // this.cardValueForm.bidBalance = 1 - // this.cardValueForm.amount = 0 + this.cardValueForm.amount = 0 }else { let file={} @@ -1307,7 +1325,7 @@ export default { } }); let this_ = this - + // let timer = setInterval(async () => { getCheckTheStatusOfYourPaymentApi(id).then(response => { if (response.data!=null){ @@ -1331,10 +1349,12 @@ export default { this_.loading = false; this_.isPay = false; clearInterval(timer); + clearTimeout(timer3); + } },500) - setTimeout(function (){ + var timer3 = setTimeout(function (){ clearInterval(timer2); clearInterval(timer); this_.loading = false; @@ -1411,11 +1431,13 @@ export default { // 关闭支付窗口 handClose(){ - this.isPay = true; + this.isPay=true, + this.isPaySuccess=false, + this.isQuery=true, this.openConfirm = false this.openRecharge = false - this.isPaySuccess = false; + // this.isPaySuccess = false; this.authCode = null this.activeRecharge='balance', @@ -1469,6 +1491,7 @@ export default { }, handleClick(tab, event) { // console.log(tab, event); + this.refStaff() this.realyPayBills = 0 }, handleChange(value) { diff --git a/fuintAdmin/src/views/oilConfig/oilGun/list.vue b/fuintAdmin/src/views/oilConfig/oilGun/list.vue index 3965c87b8..4cf4581e5 100644 --- a/fuintAdmin/src/views/oilConfig/oilGun/list.vue +++ b/fuintAdmin/src/views/oilConfig/oilGun/list.vue @@ -144,7 +144,7 @@ import {cleanTankApi} from "@/api/oilConfig/oilTank"; }, rules: { gunName: [ - { required: true, message: '请输入油罐名称', trigger: 'blur' }, + { required: true, message: '请输入油枪名称', trigger: 'blur' }, ], tankId: [ diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/MtPurchaseController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/MtPurchaseController.java index f1cdcf520..78a2303a2 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/MtPurchaseController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/MtPurchaseController.java @@ -108,7 +108,7 @@ public class MtPurchaseController extends BaseController { /** - * 盘点审核 + * 进货审核 * @param id * @return */ @@ -117,11 +117,21 @@ public class MtPurchaseController extends BaseController { return getSuccessResult(this.mtPurchaseService.audit(id)); } + /** + * 进货废除 + * @param id + * @return + */ @GetMapping("abolition") public ResponseObject abolition(Integer id) { return getSuccessResult(this.mtPurchaseService.abolition(id)); } + /** + * 进货入库 + * @param id + * @return + */ @GetMapping("storage") public ResponseObject storage(Integer id) { return getSuccessResult(this.mtPurchaseService.storage(id)); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/MtDamageDetailsMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/MtDamageDetailsMapper.xml index c17842d1c..6e6eee79f 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/MtDamageDetailsMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/MtDamageDetailsMapper.xml @@ -144,6 +144,7 @@ left join mt_goods mg ON md.goods_id = mg.id where damage_id = #{mtDamageDetails.damageId} +