diff --git a/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue b/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue index a6dce5e34..5a1eb701f 100644 --- a/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue @@ -278,6 +278,9 @@ export default { isonline:[ { required: true, message: '不能为空', trigger: 'change' } ], + activeDiscountChildList:[ + { required: true, message: '不能为空', trigger: 'change' } + ], } }; }, diff --git a/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue b/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue index d39de6699..70239e74e 100644 --- a/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue @@ -281,6 +281,9 @@ export default { isonline:[ { required: true, message: '不能为空', trigger: 'change' } ], + activeDiscountChildList:[ + { required: true, message: '不能为空', trigger: 'change' } + ], } }; }, diff --git a/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue b/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue index 9ef4a8c21..84b628326 100644 --- a/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue +++ b/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue @@ -144,8 +144,10 @@ + + @@ -165,15 +167,28 @@ {{item.oilType}}{{item.oilName}} - - - - - - - - - +
+ + + + + +
+
+ + + + + +
+
+ + + + + +
+ @@ -711,5 +726,9 @@ export default { align-items: center; } + ._k{ + box-sizing: border-box; + width: 300px; + } diff --git a/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue b/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue index 833151cb5..7b1e4cd5a 100644 --- a/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue +++ b/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue @@ -167,9 +167,9 @@ + :value="dict.id.toString()"> diff --git a/fuintAdmin/src/views/member/userInfoOrder/growthValueRecord.vue b/fuintAdmin/src/views/member/userInfoOrder/growthValueRecord.vue index 9a282f24d..b65e0c6d8 100644 --- a/fuintAdmin/src/views/member/userInfoOrder/growthValueRecord.vue +++ b/fuintAdmin/src/views/member/userInfoOrder/growthValueRecord.vue @@ -34,7 +34,8 @@ export default { } }, created() { - this.userId = this.pUserId; + // this.userId = this.pUserId; + this.userId = this.$route.query.id; }, methods:{ getList(){ diff --git a/fuintAdmin/src/views/member/userInfoOrder/refuelMoneyRecord.vue b/fuintAdmin/src/views/member/userInfoOrder/refuelMoneyRecord.vue index 1b87e17cf..d976112ec 100644 --- a/fuintAdmin/src/views/member/userInfoOrder/refuelMoneyRecord.vue +++ b/fuintAdmin/src/views/member/userInfoOrder/refuelMoneyRecord.vue @@ -35,7 +35,8 @@ export default { } }, created() { - this.userId = this.pUserId; + // this.userId = this.pUserId; + this.userId = this.$route.query.id; }, methods:{ getList(){ diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscountRecords/controller/ActiveDiscountRecordsController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscountRecords/controller/ActiveDiscountRecordsController.java new file mode 100644 index 000000000..78e0a66f0 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscountRecords/controller/ActiveDiscountRecordsController.java @@ -0,0 +1,90 @@ +package com.fuint.business.marketingActivity.activeDiscountRecords.controller; + + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.api.ApiController; +import com.baomidou.mybatisplus.extension.api.R; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuint.business.marketingActivity.activeDiscountRecords.entity.ActiveDiscountRecords; +import com.fuint.business.marketingActivity.activeDiscountRecords.service.ActiveDiscountRecordsService; +import com.fuint.framework.web.BaseController; +import com.fuint.framework.web.ResponseObject; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.io.Serializable; +import java.util.List; + +/** + * 折扣活动记录表(ActiveDiscountRecords)表控制层 + * + * @author makejava + * @since 2024-01-19 17:13:25 + */ +@RestController +@RequestMapping("business/marketingActivity/activeDiscountRecords") +public class ActiveDiscountRecordsController extends BaseController { + /** + * 服务对象 + */ + @Resource + private ActiveDiscountRecordsService activeDiscountRecordsService; + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param activeDiscountRecords 查询实体 + * @return 所有数据 + */ + @GetMapping + public ResponseObject selectAll(Page page, ActiveDiscountRecords activeDiscountRecords) { + return getSuccessResult(this.activeDiscountRecordsService.page(page, new QueryWrapper<>(activeDiscountRecords))); + } + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("{id}") + public ResponseObject selectOne(@PathVariable Serializable id) { + return getSuccessResult(this.activeDiscountRecordsService.getById(id)); + } + + /** + * 新增数据 + * + * @param activeDiscountRecords 实体对象 + * @return 新增结果 + */ + @PostMapping + public ResponseObject insert(@RequestBody ActiveDiscountRecords activeDiscountRecords) { + return getSuccessResult(this.activeDiscountRecordsService.save(activeDiscountRecords)); + } + + /** + * 修改数据 + * + * @param activeDiscountRecords 实体对象 + * @return 修改结果 + */ + @PutMapping + public ResponseObject update(@RequestBody ActiveDiscountRecords activeDiscountRecords) { + return getSuccessResult(this.activeDiscountRecordsService.updateById(activeDiscountRecords)); + } + + /** + * 删除数据 + * + * @param idList 主键结合 + * @return 删除结果 + */ + @DeleteMapping + public ResponseObject delete(@RequestParam("idList") List idList) { + return getSuccessResult(this.activeDiscountRecordsService.removeByIds(idList)); + } +} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscountRecords/entity/ActiveDiscountRecords.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscountRecords/entity/ActiveDiscountRecords.java new file mode 100644 index 000000000..935c9c588 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscountRecords/entity/ActiveDiscountRecords.java @@ -0,0 +1,107 @@ +package com.fuint.business.marketingActivity.activeDiscountRecords.entity; + +import java.util.Date; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import java.io.Serializable; + +/** + * 折扣活动记录表(ActiveDiscountRecords)表实体类 + * + * @author makejava + * @since 2024-01-19 17:13:25 + */ +@SuppressWarnings("serial") +public class ActiveDiscountRecords extends Model { + //主键id + private Integer id; + //活动id + private Integer activeDiscountId; + //用户id + private Integer userId; + //店铺id + private Integer storeId; + //创建者 + private String createBy; + //创建时间 + private Date createTime; + //更新者 + private String updateBy; + //更新时间 + private Date updateTime; + + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getActiveDiscountId() { + return activeDiscountId; + } + + public void setActiveDiscountId(Integer activeDiscountId) { + this.activeDiscountId = activeDiscountId; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public Integer getStoreId() { + return storeId; + } + + public void setStoreId(Integer storeId) { + this.storeId = storeId; + } + + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + /** + * 获取主键值 + * + * @return 主键值 + */ + @Override + protected Serializable pkVal() { + return this.id; + } + } + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscountRecords/mapper/ActiveDiscountRecordsMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscountRecords/mapper/ActiveDiscountRecordsMapper.java new file mode 100644 index 000000000..a32eb5cdd --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscountRecords/mapper/ActiveDiscountRecordsMapper.java @@ -0,0 +1,15 @@ +package com.fuint.business.marketingActivity.activeDiscountRecords.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fuint.business.marketingActivity.activeDiscountRecords.entity.ActiveDiscountRecords; + +/** + * 折扣活动记录表(ActiveDiscountRecords)表数据库访问层 + * + * @author makejava + * @since 2024-01-19 17:13:25 + */ +public interface ActiveDiscountRecordsMapper extends BaseMapper { + +} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscountRecords/service/ActiveDiscountRecordsService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscountRecords/service/ActiveDiscountRecordsService.java new file mode 100644 index 000000000..1a8eb8238 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscountRecords/service/ActiveDiscountRecordsService.java @@ -0,0 +1,15 @@ +package com.fuint.business.marketingActivity.activeDiscountRecords.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.fuint.business.marketingActivity.activeDiscountRecords.entity.ActiveDiscountRecords; + +/** + * 折扣活动记录表(ActiveDiscountRecords)表服务接口 + * + * @author makejava + * @since 2024-01-19 17:13:26 + */ +public interface ActiveDiscountRecordsService extends IService { + +} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscountRecords/service/impl/ActiveDiscountRecordsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscountRecords/service/impl/ActiveDiscountRecordsServiceImpl.java new file mode 100644 index 000000000..c73ee536a --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscountRecords/service/impl/ActiveDiscountRecordsServiceImpl.java @@ -0,0 +1,19 @@ +package com.fuint.business.marketingActivity.activeDiscountRecords.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fuint.business.marketingActivity.activeDiscountRecords.mapper.ActiveDiscountRecordsMapper; +import com.fuint.business.marketingActivity.activeDiscountRecords.entity.ActiveDiscountRecords; +import com.fuint.business.marketingActivity.activeDiscountRecords.service.ActiveDiscountRecordsService; +import org.springframework.stereotype.Service; + +/** + * 折扣活动记录表(ActiveDiscountRecords)表服务实现类 + * + * @author makejava + * @since 2024-01-19 17:13:26 + */ +@Service("activeDiscountRecordsService") +public class ActiveDiscountRecordsServiceImpl extends ServiceImpl implements ActiveDiscountRecordsService { + +} + 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 779383f55..14f15b3ae 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 @@ -485,7 +485,7 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { } //折扣+优惠券 for (ActiveDiscountPayVO activeDiscountPayVO : activeDiscountVOList) { - if (activeDiscountPayVO.getParticipationCondition().equals("1")){ + if (!activeDiscountPayVO.getParticipationCondition().equals("1")){ for (CardFavorableRecordVO cardFavorableRecordVO : canUserCardFavorableList) { if(cardFavorableRecordVO.getExclusiveFunction().equals("2") && !cardFavorableRecordVO.getExclusiveFunction().equals("0")){ ActiveDiscountPayVO activeDiscountPayVO1 = new ActiveDiscountPayVO(); @@ -525,7 +525,7 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { } //满减+优惠券 for (ActiveDiscountPayVO activeDiscountPayVO : activeFuletVOList) { - if (activeDiscountPayVO.getParticipationCondition().equals("1")){ + if (!activeDiscountPayVO.getParticipationCondition().equals("1")){ for (CardFavorableRecordVO cardFavorableRecordVO : canUserCardFavorableList) { if(cardFavorableRecordVO.getType().equals("2") && !cardFavorableRecordVO.getExclusiveFunction().equals("0")){ ActiveDiscountPayVO activeDiscountPayVO1 = new ActiveDiscountPayVO(); @@ -637,7 +637,7 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { BigDecimal bigDecimal1 = BigDecimal.valueOf(oilPriceById); String oilTypebyId = oilNameMapper.getOilTypebyId(oilId); - String gradeId = ljUserGradeMapper.selectByUserId(paymentActiveDTO.getStoreId(), userId); + String gradeId = paymentActiveDTO.getMtUserLevel().toString(); if (StringUtils.isNotEmpty(gradeId)){ LJUserGrade ljUserGrade = ljUserGradeMapper.selectAllByGradeId(gradeId); if (ObjectUtils.isNotEmpty(ljUserGrade)){ @@ -647,31 +647,26 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { }else if (ljUserGrade.getGasolineDiscount().equals("每升优惠")){ String gasolineRule = ljUserGrade.getGasolineRule(); List jsonObjects = JSONArray.parseArray(gasolineRule, JSONObject.class); - for (JSONObject jsonObject : jsonObjects) { - Integer gasolineRule1 = jsonObject.getInteger("gasolineRule1"); - BigDecimal bigDecimal = BigDecimal.valueOf(gasolineRule1); + JSONObject jsonObject = jsonObjects.stream().max(Comparator.comparingDouble(o -> o.getDouble("gasolineRule3"))).get(); + BigDecimal bigDecimal = jsonObject.getBigDecimal("gasolineRule1"); if (paymentActiveDTO.getAmount().compareTo(bigDecimal)>=0){ //升数 BigDecimal divide = paymentActiveDTO.getAmount().divide(bigDecimal1,2,RoundingMode.HALF_UP); - Integer gasolineRule3 = jsonObject.getInteger("gasolineRule3"); - BigDecimal bigDecimal2 = BigDecimal.valueOf(gasolineRule3); - BigDecimal multiply = divide.multiply(bigDecimal2); + BigDecimal gasolineRule3 = jsonObject.getBigDecimal("gasolineRule3"); + BigDecimal multiply = divide.multiply(gasolineRule3); paymentActiveVO.setMemberFavorableAmount(multiply); } - } }else { String gasolineRule = ljUserGrade.getGasolineRule(); List jsonObjects = JSONArray.parseArray(gasolineRule, JSONObject.class); - for (JSONObject jsonObject : jsonObjects) { - Integer gasolineRule1 = jsonObject.getInteger("gasolineRule1"); - BigDecimal bigDecimal = BigDecimal.valueOf(gasolineRule1); - if (paymentActiveDTO.getAmount().compareTo(bigDecimal)>=0){ + JSONObject jsonObject = jsonObjects.stream().max(Comparator.comparingDouble(o -> o.getDouble("gasolineRule2"))).get(); + BigDecimal gasolineRule1 = jsonObject.getBigDecimal("gasolineRule1"); + if (paymentActiveDTO.getAmount().compareTo(gasolineRule1)>=0){ //升数 Integer gasolineRule3 = jsonObject.getInteger("gasolineRule2"); BigDecimal bigDecimal2 = BigDecimal.valueOf(gasolineRule3); paymentActiveVO.setMemberFavorableAmount(bigDecimal2); } - } } } if (oilTypebyId.equals("柴油")){ @@ -680,31 +675,26 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { }else if (ljUserGrade.getGasolineDiscount().equals("每升优惠")){ String gasolineRule = ljUserGrade.getDieselRule(); List jsonObjects = JSONArray.parseArray(gasolineRule, JSONObject.class); - for (JSONObject jsonObject : jsonObjects) { - Integer gasolineRule1 = jsonObject.getInteger("dieselRule1"); - BigDecimal bigDecimal = BigDecimal.valueOf(gasolineRule1); + JSONObject jsonObject = jsonObjects.stream().max(Comparator.comparingDouble(o -> o.getDouble("gasolineRule3"))).get(); + BigDecimal bigDecimal =jsonObject.getBigDecimal("dieselRule1"); if (paymentActiveDTO.getAmount().compareTo(bigDecimal)>=0){ //升数 BigDecimal divide = paymentActiveDTO.getAmount().divide(bigDecimal1,2,RoundingMode.HALF_UP); - Integer gasolineRule3 = jsonObject.getInteger("dieselRule3"); - BigDecimal bigDecimal2 = BigDecimal.valueOf(gasolineRule3); + BigDecimal bigDecimal2 = jsonObject.getBigDecimal("dieselRule3"); BigDecimal multiply = divide.multiply(bigDecimal2); paymentActiveVO.setMemberFavorableAmount(multiply); } - } }else { String gasolineRule = ljUserGrade.getDieselRule(); List jsonObjects = JSONArray.parseArray(gasolineRule, JSONObject.class); - for (JSONObject jsonObject : jsonObjects) { - Integer gasolineRule1 = jsonObject.getInteger("dieselRule1"); - BigDecimal bigDecimal = BigDecimal.valueOf(gasolineRule1); + JSONObject jsonObject = jsonObjects.stream().max(Comparator.comparingDouble(o -> o.getDouble("gasolineRule2"))).get(); + BigDecimal bigDecimal = jsonObject.getBigDecimal("dieselRule1"); if (paymentActiveDTO.getAmount().compareTo(bigDecimal)>=0){ //升数 Integer gasolineRule3 = jsonObject.getInteger("dieselRule2"); BigDecimal bigDecimal2 = BigDecimal.valueOf(gasolineRule3); paymentActiveVO.setMemberFavorableAmount(bigDecimal2); } - } } } @@ -714,35 +704,28 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { }else if (ljUserGrade.getGasolineDiscount().equals("每升优惠")){ String gasolineRule = ljUserGrade.getNaturalGasRule(); List jsonObjects = JSONArray.parseArray(gasolineRule, JSONObject.class); - for (JSONObject jsonObject : jsonObjects) { - Integer gasolineRule1 = jsonObject.getInteger("naturalGas1"); - BigDecimal bigDecimal = BigDecimal.valueOf(gasolineRule1); + JSONObject jsonObject = jsonObjects.stream().max(Comparator.comparingDouble(o -> o.getDouble("gasolineRule3"))).get(); + BigDecimal bigDecimal = jsonObject.getBigDecimal("naturalGas1"); if (paymentActiveDTO.getAmount().compareTo(bigDecimal)>=0){ //升数 BigDecimal divide = paymentActiveDTO.getAmount().divide(bigDecimal1,2,RoundingMode.HALF_UP); - Integer gasolineRule3 = jsonObject.getInteger("naturalGas3"); - BigDecimal bigDecimal2 = BigDecimal.valueOf(gasolineRule3); + BigDecimal bigDecimal2 = jsonObject.getBigDecimal("naturalGas3"); BigDecimal multiply = divide.multiply(bigDecimal2); paymentActiveVO.setMemberFavorableAmount(multiply); } - } }else { String gasolineRule = ljUserGrade.getGasolineRule(); List jsonObjects = JSONArray.parseArray(gasolineRule, JSONObject.class); - for (JSONObject jsonObject : jsonObjects) { - Integer gasolineRule1 = jsonObject.getInteger("naturalGas1"); - BigDecimal bigDecimal = BigDecimal.valueOf(gasolineRule1); + JSONObject jsonObject = jsonObjects.stream().max(Comparator.comparingDouble(o -> o.getDouble("gasolineRule2"))).get(); + BigDecimal bigDecimal = jsonObject.getBigDecimal("naturalGas1"); if (paymentActiveDTO.getAmount().compareTo(bigDecimal)>=0){ //升数 Integer gasolineRule3 = jsonObject.getInteger("naturalGas2"); BigDecimal bigDecimal2 = BigDecimal.valueOf(gasolineRule3); paymentActiveVO.setMemberFavorableAmount(bigDecimal2); } - } } - } - } } return paymentActiveVO; diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminusRecords/controller/ActiveFullminusRecordsController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminusRecords/controller/ActiveFullminusRecordsController.java new file mode 100644 index 000000000..fbd107a0e --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminusRecords/controller/ActiveFullminusRecordsController.java @@ -0,0 +1,90 @@ +package com.fuint.business.marketingActivity.activeFullminusRecords.controller; + + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.api.ApiController; +import com.baomidou.mybatisplus.extension.api.R; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuint.business.marketingActivity.activeFullminusRecords.entity.ActiveFullminusRecords; +import com.fuint.business.marketingActivity.activeFullminusRecords.service.ActiveFullminusRecordsService; +import com.fuint.framework.web.BaseController; +import com.fuint.framework.web.ResponseObject; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.io.Serializable; +import java.util.List; + +/** + * 满减活动记录表(ActiveFullminusRecords)表控制层 + * + * @author makejava + * @since 2024-01-19 17:12:45 + */ +@RestController +@RequestMapping("business/marketingActivity/activeFullminusRecords") +public class ActiveFullminusRecordsController extends BaseController { + /** + * 服务对象 + */ + @Resource + private ActiveFullminusRecordsService activeFullminusRecordsService; + + /** + * 分页查询所有数据 + * + * @param page 分页对象 + * @param activeFullminusRecords 查询实体 + * @return 所有数据 + */ + @GetMapping + public ResponseObject selectAll(Page page, ActiveFullminusRecords activeFullminusRecords) { + return getSuccessResult(this.activeFullminusRecordsService.page(page, new QueryWrapper<>(activeFullminusRecords))); + } + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("{id}") + public ResponseObject selectOne(@PathVariable Serializable id) { + return getSuccessResult(this.activeFullminusRecordsService.getById(id)); + } + + /** + * 新增数据 + * + * @param activeFullminusRecords 实体对象 + * @return 新增结果 + */ + @PostMapping + public ResponseObject insert(@RequestBody ActiveFullminusRecords activeFullminusRecords) { + return getSuccessResult(this.activeFullminusRecordsService.save(activeFullminusRecords)); + } + + /** + * 修改数据 + * + * @param activeFullminusRecords 实体对象 + * @return 修改结果 + */ + @PutMapping + public ResponseObject update(@RequestBody ActiveFullminusRecords activeFullminusRecords) { + return getSuccessResult(this.activeFullminusRecordsService.updateById(activeFullminusRecords)); + } + + /** + * 删除数据 + * + * @param idList 主键结合 + * @return 删除结果 + */ + @DeleteMapping + public ResponseObject delete(@RequestParam("idList") List idList) { + return getSuccessResult(this.activeFullminusRecordsService.removeByIds(idList)); + } +} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminusRecords/entity/ActiveFullminusRecords.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminusRecords/entity/ActiveFullminusRecords.java new file mode 100644 index 000000000..9cbdccf16 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminusRecords/entity/ActiveFullminusRecords.java @@ -0,0 +1,107 @@ +package com.fuint.business.marketingActivity.activeFullminusRecords.entity; + +import java.util.Date; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import java.io.Serializable; + +/** + * 满减活动记录表(ActiveFullminusRecords)表实体类 + * + * @author makejava + * @since 2024-01-19 17:12:45 + */ +@SuppressWarnings("serial") +public class ActiveFullminusRecords extends Model { + //主键id + private Integer id; + //活动id + private Integer activeFullminusId; + //用户id + private Integer userId; + //店铺id + private Integer storeId; + //创建者 + private String createBy; + //创建时间 + private Date createTime; + //更新者 + private String updateBy; + //更新时间 + private Date updateTime; + + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getActiveFullminusId() { + return activeFullminusId; + } + + public void setActiveFullminusId(Integer activeFullminusId) { + this.activeFullminusId = activeFullminusId; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public Integer getStoreId() { + return storeId; + } + + public void setStoreId(Integer storeId) { + this.storeId = storeId; + } + + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + /** + * 获取主键值 + * + * @return 主键值 + */ + @Override + protected Serializable pkVal() { + return this.id; + } + } + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminusRecords/mapper/ActiveFullminusRecordsMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminusRecords/mapper/ActiveFullminusRecordsMapper.java new file mode 100644 index 000000000..56987169d --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminusRecords/mapper/ActiveFullminusRecordsMapper.java @@ -0,0 +1,15 @@ +package com.fuint.business.marketingActivity.activeFullminusRecords.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fuint.business.marketingActivity.activeFullminusRecords.entity.ActiveFullminusRecords; + +/** + * 满减活动记录表(ActiveFullminusRecords)表数据库访问层 + * + * @author makejava + * @since 2024-01-19 17:12:45 + */ +public interface ActiveFullminusRecordsMapper extends BaseMapper { + +} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminusRecords/service/ActiveFullminusRecordsService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminusRecords/service/ActiveFullminusRecordsService.java new file mode 100644 index 000000000..c921bd298 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminusRecords/service/ActiveFullminusRecordsService.java @@ -0,0 +1,15 @@ +package com.fuint.business.marketingActivity.activeFullminusRecords.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.fuint.business.marketingActivity.activeFullminusRecords.entity.ActiveFullminusRecords; + +/** + * 满减活动记录表(ActiveFullminusRecords)表服务接口 + * + * @author makejava + * @since 2024-01-19 17:12:45 + */ +public interface ActiveFullminusRecordsService extends IService { + +} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminusRecords/service/impl/ActiveFullminusRecordsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminusRecords/service/impl/ActiveFullminusRecordsServiceImpl.java new file mode 100644 index 000000000..932df42fc --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminusRecords/service/impl/ActiveFullminusRecordsServiceImpl.java @@ -0,0 +1,19 @@ +package com.fuint.business.marketingActivity.activeFullminusRecords.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fuint.business.marketingActivity.activeFullminusRecords.mapper.ActiveFullminusRecordsMapper; +import com.fuint.business.marketingActivity.activeFullminusRecords.entity.ActiveFullminusRecords; +import com.fuint.business.marketingActivity.activeFullminusRecords.service.ActiveFullminusRecordsService; +import org.springframework.stereotype.Service; + +/** + * 满减活动记录表(ActiveFullminusRecords)表服务实现类 + * + * @author makejava + * @since 2024-01-19 17:12:45 + */ +@Service("activeFullminusRecordsService") +public class ActiveFullminusRecordsServiceImpl extends ServiceImpl implements ActiveFullminusRecordsService { + +} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/controller/CardFavorableRecordController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/controller/CardFavorableRecordController.java index 88c4011b0..e05be9cbb 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/controller/CardFavorableRecordController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/controller/CardFavorableRecordController.java @@ -2,6 +2,7 @@ package com.fuint.business.marketingActivity.cardFavorable.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuint.business.marketingActivity.activeExchange.vo.PaymentActiveVO; import com.fuint.business.marketingActivity.cardFavorable.dto.IdListDTO; import com.fuint.business.marketingActivity.cardFavorable.entity.CardFavorable; import com.fuint.business.marketingActivity.cardFavorable.entity.CardFavorableRecord; @@ -57,7 +58,7 @@ public class CardFavorableRecordController extends BaseController { @GetMapping("getCardFavorableList") public ResponseObject getCardFavorableList(@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo, @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize, - @Param("cardFuelDiesel") CardFavorableRecord cardFavorableRecord) { + @Param("cardFavorableRecord") CardFavorableRecord cardFavorableRecord) { Page page = new Page(pageNo, pageSize); return getSuccessResult(this.cardFavorableRecordService.getCardFavorableList(page,cardFavorableRecord)); } @@ -115,6 +116,17 @@ public class CardFavorableRecordController extends BaseController { return getSuccessResult(this.cardFavorableRecordService.updateById(cardFavorableRecord)); } + /** + * 核销 + * + * @param paymentActiveVO 实体对象 + * @return 修改结果 + */ + @PutMapping("updateCardAndActiveById") + public ResponseObject updateCardAndActiveById(@RequestBody PaymentActiveVO paymentActiveVO) { + return getSuccessResult(this.cardFavorableRecordService.updateCardAndActiveById(paymentActiveVO)); + } + /** * 删除数据 * diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/CardFavorableRecordMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/CardFavorableRecordMapper.java index ae8809e49..c0be2bdf0 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/CardFavorableRecordMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/CardFavorableRecordMapper.java @@ -38,5 +38,7 @@ public interface CardFavorableRecordMapper extends BaseMapper selectAllByCondition(@Param("page") Page page, @Param("cardFavorableDTOS") CardFavorableDTOS cardFavorableDTOS); List getCanUserCardFavorableList(@Param("paymentActiveDTO") PaymentActiveDTO paymentActiveDTO); + + boolean updateCardAndActiveById(@Param("cardFavorableId") Integer cardFavorableId, @Param("userId") Integer userId, @Param("storeId") Integer storeId); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml index 407ec9bec..991da8eeb 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml @@ -43,7 +43,7 @@ left join mt_store ms on ms.id = cfr.store_id - and cfr.store_id = #{cardFavorableRecord.storeId} + and cf.store_id = #{cardFavorableRecord.storeId} and cfr.mt_user_id = #{cardFavorableRecord.mtUserId} @@ -141,5 +141,13 @@ AND cfr.end_time AND cfr.status = 0 + + + update card_favorable_record + set status = 1 + where card_favorable_id = #{cardFavorableId} + and mt_user_id = #{userId} + and store_id = #{storeId} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/CardFavorableRecordService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/CardFavorableRecordService.java index b68771cd5..1caea10f4 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/CardFavorableRecordService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/CardFavorableRecordService.java @@ -3,6 +3,7 @@ package com.fuint.business.marketingActivity.cardFavorable.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.fuint.business.marketingActivity.activeExchange.vo.PaymentActiveVO; import com.fuint.business.marketingActivity.cardFavorable.dto.IdListDTO; import com.fuint.business.marketingActivity.cardFavorable.entity.CardFavorableRecord; import com.fuint.business.marketingActivity.cardFavorable.vo.CardFavorableRecordVO; @@ -55,5 +56,12 @@ public interface CardFavorableRecordService extends IService queryWrapper = new LambdaQueryWrapper<>(); if (ObjectUtils.isNotEmpty(cardFavorableRecord.getMobile())){ @@ -214,5 +227,38 @@ public class CardFavorableRecordServiceImpl extends ServiceImpl #{amount} @@ -370,6 +371,7 @@ AND ad.STATUS = 0 AND concat(',',ad.adapt_oil,',') like concat('%',#{oilId},'%') AND concat(',',ad.diesel_user_level,',') like concat('%',#{levelId},'%') + HAVING sum(adr.id) limitAcount GROUP BY ad.id @@ -385,6 +387,7 @@ FROM active_fullminus af LEFT JOIN active_discount_child adc ON af.id = adc.active_fullminus_id + left join active_fullminus_records afr on afr.active_fullminus_id = ad.id WHERE af.store_id = #{storeId} AND adc.amount #{amount} @@ -393,6 +396,7 @@ AND af.STATUS = 0 AND concat(',',af.adapt_oil,',') like concat('%',#{oilId},'%') AND concat(',',af.diesel_user_level,',') like concat('%',#{levelId},'%') + HAVING sum(afr.id) limitAcount GROUP BY af.id diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserGradeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserGradeServiceImpl.java index 3631e9017..72b2f1dfc 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserGradeServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserGradeServiceImpl.java @@ -218,15 +218,15 @@ public class LJUserGradeServiceImpl extends ServiceImpl ljUserGrades = this.selectUserGradeByChainStoreId(store.getChainStoreId()); for (LJUserGrade ljUserGrade : ljUserGrades) { - if (ljUserGrade.getGrade().equals(userGrade.getGrade()) && ljUserGrade.getId()!=userGrade.getId()){ + if (ljUserGrade.getGrade().equals(userGrade.getGrade()) && !ljUserGrade.getId().equals(userGrade.getId())){ row = 2; flag = true; } - if (ljUserGrade.getName().equals(userGrade.getName()) && ljUserGrade.getId()!=userGrade.getId()){ + if (ljUserGrade.getName().equals(userGrade.getName()) && !ljUserGrade.getId().equals(userGrade.getId())){ row = 3; flag = true; } - if (ljUserGrade.getGrowthValue().equals(userGrade.getGrowthValue()) && ljUserGrade.getId()!=userGrade.getId()){ + if (ljUserGrade.getGrowthValue().equals(userGrade.getGrowthValue()) && !ljUserGrade.getId().equals(userGrade.getId())){ row = 4; flag = true; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/module/AlipayApi/service/impl/AlipayServiceImpl1.java b/fuintBackend/fuint-application/src/main/java/com/fuint/module/AlipayApi/service/impl/AlipayServiceImpl1.java index 6dfa53e59..31e10c78d 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/module/AlipayApi/service/impl/AlipayServiceImpl1.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/module/AlipayApi/service/impl/AlipayServiceImpl1.java @@ -73,8 +73,7 @@ public class AlipayServiceImpl1 implements AlipayService1 { //1. 获取验签和解密所需要的参数 Map openapiResult = JSON.parseObject(encryptedData, - new TypeReference>() { - }, Feature.OrderedField); + new TypeReference>() {}, Feature.OrderedField); String signType = "RSA2"; String charset = "UTF-8"; String encryptType = "AES"; @@ -90,8 +89,7 @@ public class AlipayServiceImpl1 implements AlipayService1 { // String signVeriKey = "你的小程序对应的支付宝公钥（为扩展考虑建议用appId+signType做密钥存储隔离）"; String signVeriKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnwDxxSNpBKL8xjtU3leNBy9mIOMYOr0WgxGbCxTMfhUPka9nr8Hbt0GN+7ylNBmxCYvW8kmge4dCOLUPqseM9+HyF9R1NrWBB3zQPVqnD0mKCYr9cEgtx6/eU7oIK1FqAl0G+jNIT3IKWMSXEX09yPKJWS6zk7+FRzOzn11vShTFjmrqWdrisJgRsQ54PHhPkQz7xFojDRqIunlpICWUVA8GwUg02hm5ZEhxpMHEWoJZ6Dj1wPH2Vh4CpIT/mjtD+SvssCpT0/XOEDPajcMRfgoV8fyyN0JNQDVZdMZgSO4aRHQqhC3X5CBXSuv40hHnwjcDjsPcbVav5BtaPp3wPQIDAQAB"; // String decryptKey = "你的小程序对应的加解密密钥（为扩展考虑建议用appId+encryptType做密钥存储隔离）" - String decryptKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCJJM2nlUCidns6anNtGUiCL+J83kNL1nrr6hNktHkrX9bhR8LiBU3qBX+MkGDY4snlbdz+anGWu8YkcMlfBlAr82AsdIS9UTHh3lgsIAZTBZHgzZrxn7vwHfHI6Kw7uGZJbZ320JEG3s0KyvGiW0eqGuWI4BW+sD7b6JoLtNfBq+yF9ObOcs76rNCWz+04BmhCH7i6d8arK8NKgEiI9EjBThGjLRDFK1ryacKpz4UVvIXgxEW5w0MTjo/Q7gp2VLpwE/4jc8QfDFwmGU75L+nhK0rr1l0wwSo7svWFAXvberzMCGyuuLomuh2ldDfERJbIjg/qU66gx0EML1tgpVtFAgMBAAECggEARTArDJuwswXBH3Rq7SRvPza3NbXQD6eR9gjuZcTiyG4ecyMH/40bhK/nbFu+cEzh/HxTnIrI6Xmr+eBoxybhNXsgDu1ttjELUF8i7oftiN7rfJVd0P58CySgQXKYybw65lqF8enA8M1gdkxyYS1Z10igelBKyBwUak9LwBIpM0wrPIFrLhoxIEJC6QJ8EDnm6lKbytvcCa2mMZmtWs8oFxNA/SLRWtdEgHk4hslQVqq4R8B/xUy9Cu4kjdnVMHG2MqFXOiTas3gyKZLGN1ACBfpxxtyw0RAfX294ChV4SIvp10s1VqBFudcQeXeV5ph0NXP1eNt/8o3HIu0vjc0jAQKBgQD5ZtOR19M5vAcxJykh5u01CPdfz2LztqdinCpkBIpFviceW/k1euQFaWbOKdYFUrPnuLgX7Ds6dhSrkoL1+1RiVKUR6AtqIMa4fZJIMJWEPNNYWl8s6u6j11Dkd0B10g5+KV/kKLSlwFuBQnDyHw1ND+WKHqj9vkkzimzfcwedBQKBgQCMxao2IKX8CNjXDuryGkmXac0wxql0nN8AFHjCQGm16GPwlp805nAwsHKfJK45ACeixnWH9Cn6sje3yOUpCw6KG4OougRkrQEkQpoPVrZuXEcZ4j4Wg64VgW9tUAVH/WOV0VDnOBpsM8mbKsLLglb1H9Bx7813IX1pmhm93a0ZQQKBgD6U48/75T/eg7t8xSCBrtIZDuHWy1C2a6gd4bE5Rm0buvsuPwmBbchB248uBktNpmEmA+PU3kPcL3GiEQSibVlDPiyRGpQl51eSAuvkbRBCpxHLk4hU507rj5vUpLMr44Ea5rn80N+qtgtoXakTy6WjsIiJCwSpA/tP5+PmHGn1AoGASY/VhZmEA3OAFMnX3pH8GOKR9kYqMST0p28LN78/Pm7lIskjAxrUT601CJK7dE/vZnE848Gk2judQC38CnmbrHH6WAZ020NI0HD5XsCabotMIGuItG01YEmWN9JUIC16h8Ss+Vbo/9gEJ1CuIHjJBikM3S1J+lIG3lNH1l7r4MECgYEA2eAV0x55cmjC6VIMk3EAVUFbJ1LY1U9irmI6B5e7k/OVcdRksJfMRJwcquYVSfAk4hDrl7x0Qy36XELGvMe/hx07HxeAOXON8gL1b3UHP1zxvXb90YLHseHn9lssABsXS6Enyv3nrzqUi/uzBvpdDE2SRVS6nUr7Yyui6Yl+UPA=" - ; + String decryptKey = "5k9tQMrXq1JEpVucLwvO7A=="; //如果是加密的报文则需要在密文的前后添加双引号 if (isDataEncrypted) { signContent = "\"" + signContent + "\""; diff --git a/fuintCashierWeb/src/views/details/index.vue b/fuintCashierWeb/src/views/details/index.vue index feec66302..bb23663cb 100644 --- a/fuintCashierWeb/src/views/details/index.vue +++ b/fuintCashierWeb/src/views/details/index.vue @@ -119,8 +119,8 @@ - - + @@ -1716,7 +1716,10 @@ export default { height: 100%; background: #f6f8f9; } +._l{ + +} .left { width: 20%; display: table-cell; diff --git a/fuintCashierWeb/src/views/details/userInfoOrder/couponList.vue b/fuintCashierWeb/src/views/details/userInfoOrder/couponList.vue index 35ee17d52..1961508ee 100644 --- a/fuintCashierWeb/src/views/details/userInfoOrder/couponList.vue +++ b/fuintCashierWeb/src/views/details/userInfoOrder/couponList.vue @@ -76,9 +76,9 @@ export default { } }, created() { - // this.userId = this.pUserId; - this.userId = this.$route.query.id; - + this.userId = this.pUserId; + // this.userId = this.$route.query.id; + console.log( "111111",this.userId) this.getList() this.getOilName() }, @@ -86,14 +86,18 @@ export default { getOilNames(list,oilIds){ let name = ""; let oilNames = [] - let oilId = oilIds.split(",") - list.forEach(item => { - oilId.forEach(i => { - if (item.oilName == i){ - oilNames.push(item.oilNames) - } + if(oilIds){ + let oilId = oilIds.split(",") + list.forEach(item => { + oilId.forEach(i => { + if (item.oilName == i){ + oilNames.push(item.oilNames) + } + }) }) - }) + } + + let arr = [] for (let i = 0;i{ if (res.code == 200) { + this.list = res.data.records this.total = res.data.total this.loading = false + } }) }, diff --git a/fuintCashierWeb/src/views/details/userInfoOrder/pointsRecord.vue b/fuintCashierWeb/src/views/details/userInfoOrder/pointsRecord.vue index dc046061d..1797b6490 100644 --- a/fuintCashierWeb/src/views/details/userInfoOrder/pointsRecord.vue +++ b/fuintCashierWeb/src/views/details/userInfoOrder/pointsRecord.vue @@ -45,7 +45,7 @@ export default { created() { // this.userId = this.pUserId; this.userId = this.$route.query.id; - + console.log('1212',this.userId) this.getList() }, methods:{ diff --git a/gasStation-uni/components/tabbar/tabbar.vue b/gasStation-uni/components/tabbar/tabbar.vue index e14e8549e..6545edf9c 100644 --- a/gasStation-uni/components/tabbar/tabbar.vue +++ b/gasStation-uni/components/tabbar/tabbar.vue @@ -2,26 +2,27 @@ - - + + 首页 - + 一键加油 - - + + 我的 + @@ -114,13 +115,13 @@ } .bar-img { - width: 25px; - height: 25px; + width: 50rpx; + height: 50rpx; margin: 0px auto; image { - width: 100%; - height: 100%; + width: 50rpx; + height: 50rpx; } } - + \ No newline at end of file diff --git a/gasStation-uni/config.js b/gasStation-uni/config.js index fcae9f679..893e93e32 100644 --- a/gasStation-uni/config.js +++ b/gasStation-uni/config.js @@ -1,12 +1,14 @@ // 应用全局配置 module.exports = { // baseUrl: 'https://vue.ruoyi.vip/prod-api', + // baseUrl: 'http://192.168.0.196:8081/', // baseUrl: 'http://192.168.1.4:8080/', baseUrl: 'http://192.168.0.178:8008/', + // baseUrl: 'http://192.168.1.5:8002/cdJdc', imagesUrl: 'http://www.nuoyunr.com/lananRsc', // 应用信息 @@ -30,4 +32,4 @@ module.exports = { } ] } -} \ No newline at end of file +} diff --git a/gasStation-uni/mini.project.json b/gasStation-uni/mini.project.json new file mode 100644 index 000000000..ecd9fe6cd --- /dev/null +++ b/gasStation-uni/mini.project.json @@ -0,0 +1,3 @@ +{ + "format": 2 +} diff --git a/gasStation-uni/pages.json b/gasStation-uni/pages.json index 51effa40e..7237cf8b7 100644 --- a/gasStation-uni/pages.json +++ b/gasStation-uni/pages.json @@ -19,12 +19,20 @@ { "root": "pagesLogin", "pages": [{ - "path": "login/login", - "style": { - "navigationBarTitleText": "登录", - "navigationStyle": "custom" + "path": "login/login", + "style": { + "navigationBarTitleText": "登录", + "navigationStyle": "custom" + } + }, + { + "path": "login/webview", + "style": { + "navigationBarTitleText": "声明", + "navigationStyle": "custom" + } } - }] + ] }, { "root": "pagesHome", diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue index f1dfb5852..10f9eb7d5 100644 --- a/gasStation-uni/pages/index/index.vue +++ b/gasStation-uni/pages/index/index.vue @@ -28,25 +28,25 @@ - + 二维码 - + 本站活动 - + 油卡充值 - + 积分商城 @@ -409,6 +409,7 @@ "lat": _this.latitude, "storeId": storeId, "isLogin": _this.AppToken ? "0" : "1", // 0为登录 + }, }).then((response) => { _this.distance = (Math.ceil(response.data.distance)) @@ -649,8 +650,8 @@ height: 38px; image { - width: 100%; - height: 100%; + width: 38px; + height: 38px; } margin: 5px auto; diff --git a/gasStation-uni/pages/my/my.vue b/gasStation-uni/pages/my/my.vue index c6d52640a..edf17320b 100644 --- a/gasStation-uni/pages/my/my.vue +++ b/gasStation-uni/pages/my/my.vue @@ -10,8 +10,8 @@ - + :src="baseUrl + user.avatar" mode="aspectFit"> + {{user.mobile?user.mobile:"点击登录"}} @@ -50,7 +50,7 @@ - + 我的订单 @@ -60,7 +60,7 @@ - + 待使用 @@ -69,7 +69,7 @@ - + 已完成 @@ -77,7 +77,7 @@ - + 待评价 @@ -97,7 +97,7 @@ - + 今日油价 @@ -107,7 +107,7 @@ - + 核销记录 diff --git a/gasStation-uni/pages/refuel/refuel.vue b/gasStation-uni/pages/refuel/refuel.vue index c5288b8ec..bbeabde1e 100644 --- a/gasStation-uni/pages/refuel/refuel.vue +++ b/gasStation-uni/pages/refuel/refuel.vue @@ -8,8 +8,8 @@ - - + + {{store.name}}{{store.description ? "("+store.description+")" : ""}} @@ -121,7 +121,7 @@ return { appltType:uni.getStorageSync("appltType"), value: '', - liters:"", + liters:0, show: false, pic: 0, hindex: 0, diff --git a/gasStation-uni/pagesHome/MyCard/MyCard.vue b/gasStation-uni/pagesHome/MyCard/MyCard.vue index 770da90ca..042e5a490 100644 --- a/gasStation-uni/pagesHome/MyCard/MyCard.vue +++ b/gasStation-uni/pagesHome/MyCard/MyCard.vue @@ -15,7 +15,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -84,7 +84,7 @@ - + diff --git a/gasStation-uni/pagesHome/PointsGoodsDetails/PointsGoodsDetails.vue b/gasStation-uni/pagesHome/PointsGoodsDetails/PointsGoodsDetails.vue index 85c0e6984..43e4f27ce 100644 --- a/gasStation-uni/pagesHome/PointsGoodsDetails/PointsGoodsDetails.vue +++ b/gasStation-uni/pagesHome/PointsGoodsDetails/PointsGoodsDetails.vue @@ -20,7 +20,7 @@ - + {{form.giftName}} diff --git a/gasStation-uni/pagesHome/PointsMall/PointsMall.vue b/gasStation-uni/pagesHome/PointsMall/PointsMall.vue index 041f53efa..db0f34105 100644 --- a/gasStation-uni/pagesHome/PointsMall/PointsMall.vue +++ b/gasStation-uni/pagesHome/PointsMall/PointsMall.vue @@ -19,7 +19,7 @@ - + @@ -70,7 +70,7 @@ - + {{item.giftName}} @@ -78,7 +78,7 @@ - + - + {{item.giftName}} diff --git a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue index 7ce729caf..409e28d51 100644 --- a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue +++ b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue @@ -44,6 +44,7 @@ + 立即充值 @@ -84,6 +85,8 @@ {{index+1}}.{{item || "" }} + + 推荐员工 @@ -92,6 +95,7 @@ + @@ -136,7 +140,17 @@ - + + + + + + + + + @@ -224,6 +238,12 @@ this.getStaffList() }, methods: { + open() { + console.log(); + }, + close() { + this.show = false + }, //囤油卡充值 addFuleCarRecords() { if (this.staffId == '') { @@ -369,8 +389,8 @@ }, confirm(e) { console.log(e); - this.staffId = e.value[0].id - this.yname = e.value[0].realName + this.staffId = e.id + this.yname = e.realName this.show = false }, cancel() { @@ -506,7 +526,8 @@ storeId: uni.getStorageSync("storeId") } }).then(res => { - this.columns.push(res.data.records) + this.columns = res.data.records + // this.columns.push(res.data.records) console.log("columns", this.columns); }) @@ -696,4 +717,13 @@ width: 20%; } + + .bottom-bb { + width: 100%; + height: 200px; + box-sizing: border-box; + padding: 10px; + background: white; + overflow: scroll; + } \ No newline at end of file diff --git a/gasStation-uni/pagesHome/order/order.vue b/gasStation-uni/pagesHome/order/order.vue index 12967fb6d..2dbdbc965 100644 --- a/gasStation-uni/pagesHome/order/order.vue +++ b/gasStation-uni/pagesHome/order/order.vue @@ -17,7 +17,7 @@ - + {{storeName}} @@ -52,7 +52,7 @@ - + {{goodsInfo.giftName}} diff --git a/gasStation-uni/pagesLogin/login/webview.vue b/gasStation-uni/pagesLogin/login/webview.vue new file mode 100644 index 000000000..3faf16b3b --- /dev/null +++ b/gasStation-uni/pagesLogin/login/webview.vue @@ -0,0 +1,78 @@ + + + + + \ No newline at end of file diff --git a/gasStation-uni/pagesMy/Coupons/Coupons.vue b/gasStation-uni/pagesMy/Coupons/Coupons.vue index ec1f0ae93..8f8f772d6 100644 --- a/gasStation-uni/pagesMy/Coupons/Coupons.vue +++ b/gasStation-uni/pagesMy/Coupons/Coupons.vue @@ -20,7 +20,7 @@ ￥{{item.couponAmount}} - + {{item.couponType}} diff --git a/gasStation-uni/pagesMy/VIP/vip.vue b/gasStation-uni/pagesMy/VIP/vip.vue index 367ba6429..3dbd230d6 100644 --- a/gasStation-uni/pagesMy/VIP/vip.vue +++ b/gasStation-uni/pagesMy/VIP/vip.vue @@ -32,7 +32,7 @@ - + @@ -44,7 +44,7 @@ - + {{item.name}} diff --git a/gasStation-uni/pagesMy/comment/comment.vue b/gasStation-uni/pagesMy/comment/comment.vue index 1d912b356..2f850f8ec 100644 --- a/gasStation-uni/pagesMy/comment/comment.vue +++ b/gasStation-uni/pagesMy/comment/comment.vue @@ -13,7 +13,7 @@ 您对工作人员满意吗 - + username(13583017106) diff --git a/gasStation-uni/pagesMy/invite/invite.vue b/gasStation-uni/pagesMy/invite/invite.vue index e6db534db..01129112a 100644 --- a/gasStation-uni/pagesMy/invite/invite.vue +++ b/gasStation-uni/pagesMy/invite/invite.vue @@ -9,7 +9,7 @@ - + @@ -45,7 +45,7 @@ - + {{item.inviteeUserName}} diff --git a/gasStation-uni/pagesMy/setup/index.vue b/gasStation-uni/pagesMy/setup/index.vue index 96a8e5580..812a98274 100644 --- a/gasStation-uni/pagesMy/setup/index.vue +++ b/gasStation-uni/pagesMy/setup/index.vue @@ -10,8 +10,8 @@ diff --git a/gasStation-uni/pagesRefuel/pagesRefuel/index.vue b/gasStation-uni/pagesRefuel/pagesRefuel/index.vue index 5803c06f2..ecfe59bd4 100644 --- a/gasStation-uni/pagesRefuel/pagesRefuel/index.vue +++ b/gasStation-uni/pagesRefuel/pagesRefuel/index.vue @@ -19,7 +19,7 @@ - + @@ -52,7 +52,7 @@ - + 到这去 @@ -61,7 +61,7 @@ - + 去加油