exit

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileUserController.java

@@ -5,7 +5,10 @@ import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
-import com.liquidnet.client.admin.zhengzai.smile.dto.*;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmileUserCheckVo;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmileUserParam;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmileUserVoOrg;
+import com.liquidnet.client.admin.zhengzai.smile.dto.UserCheckParam;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileUserService;
 import com.liquidnet.service.smile.entity.SmileUser;
 import com.liquidnet.service.smile.entity.dao.SmileUserCheckDao;
@@ -13,12 +16,14 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.util.ResourceUtils;
 import org.springframework.web.bind.annotation.*;
 
-import java.io.*;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -92,8 +97,7 @@ public class SmileUserController extends BaseController {
     public AjaxResult  getAreaJson(){
         String jsonStr = "";
         try {
-            String path = JSONUtils.class.getClassLoader().getResource("static/area.json").getPath();
-            File jsonFile = ResourceUtils.getFile(path);
+            String path = Objects.requireNonNull(JSONUtils.class.getClassLoader().getResource("static/area.json")).getPath();
             logger.info("path:{}",path);
             InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("static/area.json");
             if (inputStream != null){

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

@@ -197,6 +197,9 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
             List<ShowAgentVo> showAgentVoList = new ArrayList<>();
             List<ShowTicketVo> showTicketVoList = new ArrayList<>();
             List<SmileAgent> smileAgents = getSmileAgentsByProId(performancesId);
+            if (smileAgents != null) {
+                return AjaxResult.warn("该演出未开启代理票种");
+            }
             Map<String, SmileAgent> map = getSmileAgentMap(smileAgents);
 
             //代理票的id
@@ -322,7 +325,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
         return AjaxResult.success();
     }
 
-    private UserData getUserData(String performancesId, SmileUser smileUser,Map<String, SmileAgent> map, List<TicketAndStatusDao> smileAgentList) {
+    private UserData getUserData(String performancesId, SmileUser smileUser, Map<String, SmileAgent> map, List<TicketAndStatusDao> smileAgentList) {
         UserData userData = new UserData();
         //个人用户的演出数据详情
         //便利票种id 查询用户的销售数据信息
@@ -330,33 +333,33 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
         for (TicketAndStatusDao smileAgent : smileAgentList) {
             UserDataAgentVo userDataAgentVo = new UserDataAgentVo();
             Map userMap = smileAgentMapper.getUserDataByPerIdAndTicketsId(performancesId, smileUser.getUid(), smileAgent.getTicketsId());
-            if (userMap!=null){
+            if (userMap != null) {
                 userDataAgentVo.setTicketsId((String) userMap.get("tid"));
                 userDataAgentVo.setTicketName((String) userMap.get("title"));
                 userDataAgentVo.setNumber((BigDecimal) userMap.get("num"));
                 userDataAgentVo.setPrice((BigDecimal) userMap.get("price"));
                 userDataAgentVo.setAgent((BigDecimal) userMap.get("use"));
                 userDataAgentVo.setCommission((BigDecimal) userMap.get("totalPrice"));
-            }else {
+            } else {
                 userDataAgentVo.setTicketsId(smileAgent.getTicketsId());
                 userDataAgentVo.setTicketName(smileAgent.getTitle());
                 userDataAgentVo.setNumber(new BigDecimal(0));
                 userDataAgentVo.setPrice(new BigDecimal(0));
-                userDataAgentVo.setAgent(smileUser.getType()==1?map.get(smileAgent.getTicketsId()).getTotalCarry():map.get(smileAgent.getTicketsId()).getOrdCarry());
+                userDataAgentVo.setAgent(smileUser.getType() == 1 ? map.get(smileAgent.getTicketsId()).getTotalCarry() : map.get(smileAgent.getTicketsId()).getOrdCarry());
                 userDataAgentVo.setCommission(new BigDecimal(0));
-                log.info("saleData：演出id:{},用户id:{},票提id:{}",performancesId,smileUser.getUid(),smileAgent.getTicketsId());
+                log.info("saleData：演出id:{},用户id:{},票提id:{}", performancesId, smileUser.getUid(), smileAgent.getTicketsId());
             }
             //判断该用户是否是总代理
-            if (smileUser.getType()==1){
+            if (smileUser.getType() == 1) {
                 //是总代  //在原有的数据上新增加该用户下所有普代的提成
-                Map orgMap =  smileAgentMapper.getUserOrgByPerIdAndUidAndAgentMaster(performancesId, smileUser.getUid(), smileAgent.getTicketsId());
-                if (orgMap!=null){
+                Map orgMap = smileAgentMapper.getUserOrgByPerIdAndUidAndAgentMaster(performancesId, smileUser.getUid(), smileAgent.getTicketsId());
+                if (orgMap != null) {
                     userDataAgentVo.setCommission(userDataAgentVo.getCommission().add((BigDecimal) orgMap.get("totalPrice")));
-                }else {
-                    log.info("saleData：演出id:{},用户id:{},票提id:{}",performancesId,smileUser.getUid(),smileAgent.getTicketsId());
+                } else {
+                    log.info("saleData：演出id:{},用户id:{},票提id:{}", performancesId, smileUser.getUid(), smileAgent.getTicketsId());
                 }
             }
-            if (userDataAgentVo.getCommission().compareTo(new BigDecimal(0))!=0) {
+            if (userDataAgentVo.getCommission().compareTo(new BigDecimal(0)) != 0) {
                 userDataAgentVos.add(userDataAgentVo);
             }
         }