diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/AgencyController.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/AgencyController.java index 0ba4260..0edd684 100644 --- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/AgencyController.java +++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/controller/AgencyController.java @@ -110,6 +110,23 @@ public class AgencyController { return agencyService.getSumDeviceStock(userId); } + /** + * 获取设备列表 + * @param loginName + * @param token + * @param userId + * @param merchantCode + * @param pageNum + * @param pageSize + * @return + */ + @RequestMapping("getDeviceStockInfo") + public RespBody getDeviceStockInfo(@RequestHeader("loginName") String loginName, @RequestHeader("token") String token, @RequestHeader("userId") String userId, + @RequestParam("merchantCode") String merchantCode,@RequestParam(value = "pageNum",defaultValue = "1") Integer pageNum,@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize + ){ + return agencyService.getSumDeviceStockInfo(userId,merchantCode,pageNum,pageSize); + } + /** * 获取创客审核列表 diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/AgencyService.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/AgencyService.java index 3b6caf2..54fc18b 100644 --- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/AgencyService.java +++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/AgencyService.java @@ -12,6 +12,7 @@ import com.chaozhanggui.dao.system.entity.TbPlussUserApp; import com.chaozhanggui.dao.system.entity.TbPlussUserInfo; import com.chaozhanggui.dao.system.entity.TbPlussUserPromotion; import com.chaozhanggui.dao.system.model.CashStatus; +import com.chaozhanggui.dao.system.model.ProfitPO; import com.chaozhanggui.dao.system.util.N; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -24,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.sql.Timestamp; import java.util.*; +import java.util.stream.Collectors; @Service @Slf4j @@ -246,6 +248,13 @@ public class AgencyService { return new RespBody("000000",userPromotionMapper.selectCount(userId)); } + public RespBody getSumDeviceStockInfo(String userId,String merchantCode,Integer pageNum,Integer pageSize){ + PageHelper.startPage(pageNum, pageSize); + List> list= userPromotionMapper.selectDeviceStok(userId,merchantCode); + PageInfo pageInfo=new PageInfo(list); + return new RespBody("000000",pageInfo); + } + public RespBody getUserMark(String userId,String phone,String name,Integer pageNum,Integer pageSize){ PageHelper.startPage(pageNum, pageSize); @@ -273,8 +282,22 @@ public class AgencyService { return new RespBody("000019"); } PageHelper.startPage(pageNo, pageSize); - List> list=userAppMapper.selectProfit(userId, orderNumber, merchantCode); + List list= userAppMapper.selectProfit(userId,orderNumber,merchantCode); + + if(ObjectUtil.isEmpty(list)||list.size()<=0){ + return new RespBody("000000"); + } + list.stream().forEach(it->{ + TbPlussUserPromotion userPromotion= userPromotionMapper.selectUserPromotionByUserId(userId,it.getUserId()); + if(ObjectUtil.isNotEmpty(userPromotion)){ + it.setLoginName(userPromotion.getLoginName()); + it.setTypeCode(userPromotion.getTypeCode()); + it.setCurrentFee(userPromotion.getCurrentFee().toString()); + + } + }); PageInfo pageInfo=new PageInfo(list); + return new RespBody("000000",pageInfo); } diff --git a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/Userservice.java b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/Userservice.java index 0d8406a..6c8cbff 100644 --- a/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/Userservice.java +++ b/newadmin/admin/src/main/java/com/chaozhanggui/admin/system/service/Userservice.java @@ -124,7 +124,18 @@ public class Userservice { } public RespBody getIndexData(Integer userId){ - return new RespBody("000000",userInfoMapper.selectIndexData(userId)); + Map map= userInfoMapper.selectIndexData(userId); + if(ObjectUtil.isEmpty(map)||map.size()<=0){ + TbPlussUserPromotion userPromotion= userPromotionMapper.selectByPrimaryKey(userId); + map=new HashMap<>(); + map.put("sumConsumeFee",0); + map.put("yestedayConsumeFee",0); + map.put("sumfansShareMoney",0); + map.put("yestedayShareMoney",0); + map.put("currentFee",ObjectUtil.isEmpty(userPromotion)?0:userPromotion.getCurrentFee()); + + } + return new RespBody("000000",map); } @Autowired diff --git a/newadmin/admin/src/main/resources/application-prod.yml b/newadmin/admin/src/main/resources/application-prod.yml index 45d93a8..ff5da5c 100644 --- a/newadmin/admin/src/main/resources/application-prod.yml +++ b/newadmin/admin/src/main/resources/application-prod.yml @@ -1,6 +1,6 @@ spring: datasource: -# url: jdbc:mysql://rm-bp19ib8x213kh9t45.rwlb.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=CTT&useSSL=false +# url: jdbc:mysql://rm-bp1uo9iq250st2e691o.mysql.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=CTT&useSSL=false url: jdbc:mysql://rm-bp1uo9iq250st2e69.mysql.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=CTT&useSSL=false username: root password: prodCZGmysqlroot@123 diff --git a/newadmin/admin/src/main/resources/application.yml b/newadmin/admin/src/main/resources/application.yml index 9ed598c..f0d1a3d 100644 --- a/newadmin/admin/src/main/resources/application.yml +++ b/newadmin/admin/src/main/resources/application.yml @@ -5,6 +5,10 @@ server: port: 18071 servlet: context-path: /admin +# 指定日志级别 把springboot的所有日志修改成为debug +logging: + level: + root: debug mybatis: configuration: map-underscore-to-camel-case: true diff --git a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussUserAppMapper.java b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussUserAppMapper.java index c8cb0d8..7c585cf 100644 --- a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussUserAppMapper.java +++ b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussUserAppMapper.java @@ -2,6 +2,7 @@ package com.chaozhanggui.dao.system.dao; import com.chaozhanggui.dao.system.entity.TbPlussUserApp; +import com.chaozhanggui.dao.system.model.ProfitPO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; @@ -26,5 +27,5 @@ public interface TbPlussUserAppMapper { int countByInviteNum(String inviteNum); - List> selectProfit(@Param("userId") String userId,@Param("orderNumber") String orderNumber,@Param("merchantCode") String merchantCode); + List selectProfit(@Param("userId") String userId, @Param("orderNumber") String orderNumber, @Param("merchantCode") String merchantCode); } \ No newline at end of file diff --git a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussUserPromotionMapper.java b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussUserPromotionMapper.java index 1814763..182d10a 100644 --- a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussUserPromotionMapper.java +++ b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/dao/TbPlussUserPromotionMapper.java @@ -45,4 +45,10 @@ public interface TbPlussUserPromotionMapper { Map selectCount(String userId); List> selectMarkByUserId(@Param("userId") String userId,@Param("phone") String phone,@Param("name") String name); + + + List> selectDeviceStok(@Param("userId") String userId,@Param("merchantCode") String merchantCode); + + + TbPlussUserPromotion selectUserPromotionByUserId(@Param("userId") String userId,@Param("orderUserId") String orderUserId); } \ No newline at end of file diff --git a/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/model/ProfitPO.java b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/model/ProfitPO.java new file mode 100644 index 0000000..1bcd0dd --- /dev/null +++ b/newadmin/dao-api/src/main/java/com/chaozhanggui/dao/system/model/ProfitPO.java @@ -0,0 +1,32 @@ +package com.chaozhanggui.dao.system.model; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class ProfitPO implements Serializable { + + private String userId; + + private String merchantCode; + + private String merchantName; + + private String orderNumber; + + private String price; + + private String loginName; + + private String typeCode; + + private Date createDt; + + private String currentFee; + + private String consumeFee; + + +} diff --git a/newadmin/dao-api/src/main/resources/mapper/TbPlussUserAppMapper.xml b/newadmin/dao-api/src/main/resources/mapper/TbPlussUserAppMapper.xml index 26bb2e0..60d934e 100644 --- a/newadmin/dao-api/src/main/resources/mapper/TbPlussUserAppMapper.xml +++ b/newadmin/dao-api/src/main/resources/mapper/TbPlussUserAppMapper.xml @@ -544,33 +544,28 @@ select count(0) from tb_pluss_user_app where inviteNum=#{inviteNum} - SELECT p.merchantCode, p.merchantName, - p.orderNumber, p.price, - u.loginName, - m.type_code AS typeCode, + p.consumeFee, p.createDt, - m.current_fee AS currentFee, - p.consumeFee + b.userId FROM - tb_pluss_merchant_profit p - LEFT JOIN tb_pluss_merchant_base_info b ON p.userId = b.userId - LEFT JOIN tb_pluss_user_promotion m ON p.userId = m.user_id - LEFT JOIN tb_pluss_user_info u ON p.userId = u.id - WHERE - p.merchantParentId = #{userId} - AND p.price != 0 + tb_pluss_merchant_profit p left join tb_pluss_merchant_base_info b on p.merchantCode=b.merchantCode + where p.userId=#{userId} + and p.price!=0 - and p.orderNumber=#{orderNumber} - + and p.orderNumber=#{orderNumber} + and p.merchantCode=#{merchantCode} ORDER BY - p.id DESC - + p.id DESC + \ No newline at end of file diff --git a/newadmin/dao-api/src/main/resources/mapper/TbPlussUserPromotionMapper.xml b/newadmin/dao-api/src/main/resources/mapper/TbPlussUserPromotionMapper.xml index f1ecd3b..e651ecc 100644 --- a/newadmin/dao-api/src/main/resources/mapper/TbPlussUserPromotionMapper.xml +++ b/newadmin/dao-api/src/main/resources/mapper/TbPlussUserPromotionMapper.xml @@ -238,12 +238,11 @@ + + + + \ No newline at end of file