Merge branch 'mymaster' into 'master'

修改统计的bug

See merge request rays/pcloud-book!37

pcloud-service-book/pom.xml

@@ -158,6 +158,24 @@
 		</dependency>
 
 		<dependency>
+			<groupId>com.pcloud.facade</groupId>
+			<artifactId>pcloud-facade-audioapp</artifactId>
+			<version>${pcloud-facade-audioapp.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.pcloud.facade</groupId>
+			<artifactId>pcloud-facade-videolesson</artifactId>
+			<version>${pcloud-facade-videolesson.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.pcloud.facade</groupId>
+			<artifactId>pcloud-facade-liveapp</artifactId>
+			<version>${pcloud-facade-liveapp.version}</version>
+		</dependency>
+
+		<dependency>
 			<groupId>fakepath</groupId>
 			<artifactId>jbarcode</artifactId>
 			<version>0.2.8</version>

pcloud-service-book/src/main/java/com/pcloud/book/consumer/trade/TradeConsr.java

@@ -6,6 +6,7 @@ import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.ResponseHandleUtil;
 import com.pcloud.facade.tradecenter.dto.GroupMoneyDto;
 import com.pcloud.facade.tradecenter.dto.QrGroupBuyDetailDto;
+import com.pcloud.facade.tradecenter.dto.SpeWechatGroupDto;
 import com.pcloud.facade.tradecenter.dto.WechatGroupDto;
 import com.pcloud.facade.tradecenter.service.OrderFormService;
 
@@ -69,4 +70,24 @@ public class TradeConsr {
         }
         return map;
     }
+
+    /**
+     * 获取购买人数量
+     */
+    public Map<Long, GroupMoneyDto> getSpeQrGroupSaleMoney(SpeWechatGroupDto speWechatGroupDto) throws BizException{
+        Map<Long, GroupMoneyDto> map = new HashMap<>();
+        if (speWechatGroupDto == null) {
+            return map;
+        }
+        try {
+            ResponseEntity<ResponseDto<Map<Long, GroupMoneyDto>>> responseEntityP = orderFormService.getSpeQrGroupSaleMoney(speWechatGroupDto);
+            map = ResponseHandleUtil.parseMap(responseEntityP, Long.class, GroupMoneyDto.class);
+        } catch (Exception e) {
+            LOGGER.error("获取交易额.[获取购买人数量]:" + e.getMessage(), e);
+        }
+        if (map == null) {
+            map = new HashMap<>();
+        }
+        return map;
+    }
 }

pom.xml

@@ -125,7 +125,9 @@
         <pcloud-facade-labelcenter.version>2.1.0-RELEASE</pcloud-facade-labelcenter.version>
        <pcloud-facade-wechatgroup.version>2.1.0-RELEASE</pcloud-facade-wechatgroup.version>
         <pcloud-facade-promotion.version>2.1.0-RELEASE</pcloud-facade-promotion.version>
-     
+        <pcloud-facade-audioapp.version>2.1.0-RELEASE</pcloud-facade-audioapp.version>
+        <pcloud-facade-videolesson.version>2.1.0-RELEASE</pcloud-facade-videolesson.version>
+        <pcloud-facade-liveapp.version>2.1.0-RELEASE</pcloud-facade-liveapp.version>
       </properties>
 
     <dependencyManagement>