bug:总代打款

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileShowServiceImpl.java

@@ -192,25 +192,27 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                 for (SmileUser smileUser : smileUsers) {
                     //获取缓存单个用户代理记录
                     UserData userDataByUid = smileRedisUtils.getUserDataByUid(smilePriceParam.getPerformancesId(), smileUser.getUid());
-                    SmilePrice smilePriceByUidAndPerId = SmilePrice.getNew();
-                    BigDecimal price = new BigDecimal("0");
-                    List<UserDataAgentVo> dataAgentVos = userDataByUid.getDataAgentVos();
-                    for (UserDataAgentVo userDataAgentVo : dataAgentVos) {
-                        price = price.add(userDataAgentVo.getCommission());
+                    if (userDataByUid!=null){
+                        SmilePrice smilePriceByUidAndPerId = SmilePrice.getNew();
+                        BigDecimal price = new BigDecimal("0");
+                        List<UserDataAgentVo> dataAgentVos = userDataByUid.getDataAgentVos();
+                        for (UserDataAgentVo userDataAgentVo : dataAgentVos) {
+                            price = price.add(userDataAgentVo.getCommission());
+                        }
+                        smilePriceByUidAndPerId.setPerformancesId(smilePriceParam.getPerformancesId());
+                        smilePriceByUidAndPerId.setUid(smileUser.getUid());
+                        smilePriceByUidAndPerId.setPrice(price);
+                        if (smileUser.getUid().equals(smilePriceParam.getUid())) {
+                            priceByUid = price;
+                        }
+                        smilePriceByUidAndPerId.setCreatedDate(LocalDateTime.now());
+
+                        String userDataJson = JSON.toJSONString(userDataByUid);
+                        //保存打款金额
+                        smilePriceByUidAndPerId.setRecord(userDataJson);
+                        smilePriceByUidAndPerId.setStatus(0);
+                        smilePriceMapper.insert(smilePriceByUidAndPerId);
                     }
-                    smilePriceByUidAndPerId.setPerformancesId(smilePriceParam.getPerformancesId());
-                    smilePriceByUidAndPerId.setUid(smileUser.getUid());
-                    smilePriceByUidAndPerId.setPrice(price);
-                    if (smileUser.getUid().equals(smilePriceParam.getUid())) {
-                        priceByUid = price;
-                    }
-                    smilePriceByUidAndPerId.setCreatedDate(LocalDateTime.now());
-
-                    String userDataJson = JSON.toJSONString(userDataByUid);
-                    //保存打款金额
-                    smilePriceByUidAndPerId.setRecord(userDataJson);
-                    smilePriceByUidAndPerId.setStatus(0);
-                    smilePriceMapper.insert(smilePriceByUidAndPerId);
                 }
             }
             //打过款   表中已有数据直接修改打款记录即可

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileUserMapper.xml

@@ -179,6 +179,7 @@
                 INNER JOIN ( SELECT kotr.agent_id, kotr.agent_id_master FROM kylin_order_ticket_relations AS kotr WHERE kotr.performance_id = #{performancesId} AND kotr.agent_id != 0 ) kk ON su.uid = kk.agent_id
                 OR su.uid = kk.agent_id_master
         WHERE su.type = 1
+        GROUP BY su.uid
     </select>
 
     <select id="selectUidByPerIdNotType" resultType="com.liquidnet.service.smile.entity.SmileUser">
@@ -188,6 +189,7 @@
             smile_user AS su
                 INNER JOIN ( SELECT kotr.agent_id, kotr.agent_id_master FROM kylin_order_ticket_relations AS kotr WHERE kotr.performance_id = #{performancesId} AND kotr.agent_id != 0 ) kk ON su.uid = kk.agent_id
                 OR su.uid = kk.agent_id_master
+        GROUP BY su.uid
     </select>