springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/NewFightIntegral.java
@@ -30,6 +30,9 @@ @ApiModelProperty(value = "积分变动数量") private String integralNum="0"; @ApiModelProperty(value = "商家id") private String merchantId; @ApiModelProperty(value = "变动备注") private String remark;
@@ -86,7 +86,7 @@ private String status; @ApiModelProperty("营业积分") private String businessCredit; private String businessCredit="0"; @ApiModelProperty("社区id") private String communityId; springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightConvenientMerchantService.java
@@ -1,12 +1,8 @@ package com.panzhihua.service_dangjian.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.partybuilding.NewFightResourceSharingDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.building.NewFightConvenientMerchantVO; import com.panzhihua.service_dangjian.entity.NewFightConvenientMerchant; import org.apache.ibatis.annotations.Param; /** * @program: springcloud_k8s_panzhihuazhihuishequ springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComActIntegralUsersServiceImpl.java
@@ -5,15 +5,14 @@ import com.panzhihua.common.model.dtos.partybuilding.NewFightIntegral; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.building.IntegratingTaskVO; import com.panzhihua.common.model.vos.community.building.NewFightConvenientMerchantVO; import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.service_dangjian.dao.ComActIntegralUsersMapper; import com.panzhihua.service_dangjian.entity.ComActIntegralUser; import com.panzhihua.service_dangjian.entity.ComActIntegralUserTrade; import com.panzhihua.service_dangjian.entity.IntegratingTask; import com.panzhihua.service_dangjian.service.ComActIntegralUserChangeDAOService; import com.panzhihua.service_dangjian.service.ComActIntegralUserTradeDaoService; import com.panzhihua.service_dangjian.service.ComActIntegralUsersService; import com.panzhihua.service_dangjian.service.NewFightIntegratingTaskService; import com.panzhihua.service_dangjian.entity.NewFightConvenientMerchant; import com.panzhihua.service_dangjian.service.*; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -40,6 +39,9 @@ @Resource private NewFightIntegratingTaskService taskService; @Resource private NewFightConvenientMerchantService merchantService; @Override @@ -102,11 +104,31 @@ { case "9": //商城积分兑换 item.setAddOrReduce(2); //积分总数加减 break; case "10": //商家线下积分兑换 item.setAddOrReduce(2); //商家线下积分兑换 增加 //商家积分增加 NewFightConvenientMerchant merchant=merchantService.selectMerchantById(item.getMerchantId()); int allMoney=0; if(!StringUtils.isEmpty(merchant.getBusinessCredit())) { allMoney=Integer.valueOf(merchant.getBusinessCredit()); } if (item.getAddOrReduce() == ComActIntegralUserTrade.changeType.add) { allMoney=allMoney+Integer.valueOf(item.getIntegralNum()); } else { //商家积分减少 allMoney=allMoney-Integer.valueOf(item.getIntegralNum()); } NewFightConvenientMerchantVO merchantVO=new NewFightConvenientMerchantVO(); merchantVO.setId(merchant.getId()); merchantVO.setBusinessCredit(allMoney+""); merchantService.editData(merchantVO); break; case "11": //花城登录 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightShoppingOrderServiceImpl.java
@@ -54,31 +54,34 @@ item.setOrderNumber(Snowflake.getId()+""); //判断是线上下单 还是商家线下下单 1线上 2线下 if(StringUtils.equals("1",item.getOrderType())) { } NewFightShopping goods=shoppingService.getDetails(item.getGoodsId()); int allMoney=0; int getMoney=Integer.valueOf(goods.getGoodPrice()); // 查询用户积分账户 ComActIntegralUser integralUserDO = integralUsersService.getOne(new QueryWrapper<ComActIntegralUser>().lambda() .eq(ComActIntegralUser::getUserId, item.getUserId()) .eq(ComActIntegralUser::getCommunityId, item.getCommunityId())); int allMoney=0; int getMoney=0; if(integralUserDO==null) { return R.fail("积分不足！"); } allMoney=integralUserDO.getIntegralAvailableSum(); //判断是线上下单 还是商家线下下单 1线上 2线下 if(StringUtils.equals("1",item.getOrderType())) { NewFightShopping goods=shoppingService.getDetails(item.getGoodsId()); getMoney=Integer.valueOf(goods.getGoodPrice()); } else { getMoney=Integer.valueOf(item.getPalyMoney()); } if(getMoney>allMoney) { @@ -86,21 +89,33 @@ } item.setCancelType("0"); item.setPalyMoney(goods.getGoodPrice()); item.setPalyMoney(getMoney+""); int num= baseMapper.addData(item); if(num>0) { //修改个人积分总额 allMoney=allMoney-getMoney; NewFightIntegral integral=new NewFightIntegral(); integral.setIntegralNum(allMoney+""); integral.setAddOrReduce(2); integral.setCommunityId(item.getCommunityId()); integral.setUserId(item.getUserId()); integral.setType("9"); integral.setIdentityType("1"); integral.setRemark("积分兑换商品"); if(StringUtils.equals("1",item.getOrderType())) { integral.setType("9"); integral.setIdentityType("1"); integral.setRemark("积分兑换商品"); } else { integral.setType("10"); integral.setIdentityType("1"); integral.setRemark("商家兑换商品"); integral.setMerchantId(item.getMerchantId()); integral.setIntegralNum(item.getPalyMoney()); } integralUsersService.upIntegral(integral); return R.ok(); @@ -155,9 +170,21 @@ integral.setAddOrReduce(1); integral.setCommunityId(order.getCommunityId()); integral.setUserId(order.getUserId()); integral.setType("9"); integral.setIdentityType("1"); integral.setRemark("积分兑换商品取消"); if(StringUtils.equals("1",order.getOrderType())) { integral.setType("9"); integral.setIdentityType("1"); integral.setRemark("积分兑换商品取消"); } else { integral.setType("10"); integral.setIdentityType("1"); integral.setRemark("商家兑换商品取消"); integral.setMerchantId(order.getMerchantId()); integral.setIntegralNum(order.getPalyMoney()); } integralUsersService.upIntegral(integral); return R.ok();
