客户端用户详细积分

src/main/java/org/rcisoft/business/bpersonvalue/controller/BPersonValueController.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections.map.HashedMap;
 import org.bouncycastle.asn1.x509.sigi.PersonalData;
 import org.rcisoft.business.bbanner.entity.BBanner;
 import org.rcisoft.business.bpersonvalue.dto.PersonValueDto;
@@ -29,6 +30,7 @@ import org.rcisoft.business.bpersonvalue.entity.BPersonValue;
 import org.rcisoft.business.bpersonvalue.service.BPersonValueService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
 * Created by  on 2019-11-13 13:28:38.
@@ -44,7 +46,7 @@ public class BPersonValueController extends PaginationController<BPersonValue> {
 
     @ApiOperation(value = "1601 明细", notes = " type类型（0：获取积分 +，1：消耗积分 -）", response = BBanner.class)
     @GetMapping(value = "/queryByPagination")
-    @ApiImplicitParam(name = "businessId", value = "主键id", required = true, dataType = "varchar")
+    @ApiImplicitParam(name = "businessId", value = "用户id", required = true, dataType = "varchar")
     public Result queryByPagination(CurUser curUser,String businessId) {
         bPersonValueServiceImpl.queryByPagination(getPaginationUtility(), curUser.getCorpId(),businessId);
         GridModel gridModel = getGridModelResponse();
@@ -64,4 +66,19 @@ public class BPersonValueController extends PaginationController<BPersonValue> {
                 personValueDto);
     }
 
+    @ApiOperation(value = "1603 用户明细带总积分", notes = " 用户明细带总积分", response = BBanner.class)
+    @GetMapping(value = "/queryPersonValueByPagination")
+    @ApiImplicitParam(name = "businessId", value = "用户id", required = true, dataType = "varchar")
+    public Result queryPersonValueByPagination(CurUser curUser,String businessId) {
+        bPersonValueServiceImpl.queryByPagination(getPaginationUtility(), curUser.getCorpId(),businessId);
+        GridModel gridModel = getGridModelResponse();
+        Map<String,Object> map = new HashedMap();
+        map.put("details",gridModel);
+        map.put("userValue",bPersonValueServiceImpl.getUserValue(curUser.getCorpId(),businessId));
+        return Result.builder(new PersistModel(1),
+                MessageConstant.MESSAGE_ALERT_SUCCESS,
+                MessageConstant.MESSAGE_ALERT_ERROR,
+                map);
+    }
+
 }

src/main/java/org/rcisoft/business/bpersonvalue/dao/BPersonValueRepository.java

@@ -23,6 +23,9 @@ public interface BPersonValueRepository extends BaseMapper<BPersonValue> {
     @ResultMap(value = "BaseResultMap" )
     List<BPersonValue> queryBPersonValues(@Param("id") String id);
 
+    @Select("select `value` from s_user where business_id = #{businessId} and del_flag != 1 and flag =1 and corp_id = #{corpId}")
+    String getUserValue(@Param("corpId") String corpId, @Param("businessId") String businessId);
+
     /**
      * 更新s_user表中value
      * @param personId

src/main/java/org/rcisoft/business/bpersonvalue/service/BPersonValueService.java

@@ -14,6 +14,8 @@ public interface BPersonValueService {
 
     List<BPersonValue> queryByPagination(PageUtil pageUtil,String corpId,String businessId);
 
+    String getUserValue(String corpId,String businessId);
+
     int add(PersonValueDto personValueDto,String corpId);
 
 }

src/main/java/org/rcisoft/business/bpersonvalue/service/impl/BPersonValueServiceImpl.java

@@ -39,6 +39,11 @@ public class BPersonValueServiceImpl implements BPersonValueService {
         return bPersonValueRepository.queryBPersonValues(businessId);
     }
 
+    @Override
+    public String getUserValue(String corpId, String businessId) {
+        return bPersonValueRepository.getUserValue(corpId,businessId);
+    }
+
     @Override
     public int add(PersonValueDto personValueDto,String corpId) {
         BPersonValue bPersonValue = new BPersonValue();