exit 修改票提逻辑修改

liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/dto/vo/SmileAgentVo.java

 package com.liquidnet.service.goblin.dto.vo;
 
+import com.liquidnet.service.smile.entity.SmileAgent;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
@@ -14,7 +16,7 @@ import java.math.BigDecimal;
  * @since 2022-03-16
  */
 @Data
-public class SmileAgentVo {
+public class SmileAgentVo implements Serializable, Cloneable{
 
     private Long id;
 
@@ -45,5 +47,31 @@ public class SmileAgentVo {
     @ApiModelProperty(value = "普代票提")
     private BigDecimal ordCarry;
 
+    public BigDecimal getTotalCarry() {
+        return totalCarry!=null?this.totalCarry:BigDecimal.valueOf(0);
+    }
+
+    public BigDecimal getOrdCarry() {
+        return ordCarry!=null?this.ordCarry:BigDecimal.valueOf(0);
+    }
+
+    private static final SmileAgentVo obj = new SmileAgentVo();
+    public static SmileAgentVo getNew() {
+        try {
+            return (SmileAgentVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SmileAgentVo();
+        }
+    }
+
+    public SmileAgentVo copy(SmileAgent smileAgent) {
+        if (null == smileAgent) return this;
+        this.setId(smileAgent.getId());
+        this.setPerformanceId(smileAgent.getPerformanceId());
+        this.setTicketId(smileAgent.getTicketId());
+        this.setTotalCarry(smileAgent.getTotalCarry());
+        this.setOrdCarry(smileAgent.getOrdCarry());
+        return this;
+    }
 
 }

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

@@ -38,46 +38,42 @@ public class SmileAgentServiceImpl extends ServiceImpl<SmileAgentMapper, SmileAg
 
     @Override
     public AjaxResult create(List<SmileAgent> smileAgents) {
-        boolean result = true;
         if (StringUtils.isNotEmpty(smileAgents)) {
+            int count = smileAgents.size();
             for (SmileAgent agent : smileAgents) {
-                result = !StringUtils.isEmpty(agent.getPerformanceId()) && !StringUtils.isEmpty(agent.getTicketId());
+                if (StringUtils.isEmpty(agent.getPerformanceId()) && StringUtils.isEmpty(agent.getTicketId())) {
+                    return AjaxResult.error();
+                }
             }
-            if (result) {
-                try {
-                    for (SmileAgent smileAgent : smileAgents){
-                        SmileAgentVo agent = smileRedisUtils.getAgent(smileAgent.getPerformanceId(),smileAgent.getTicketId());
-                        if (agent!=null){
-                            log.info("SmileAgent:{}",agent);
-                            //修改过票提则无法再次修改
-                            return AjaxResult.warn("票提一但设置，无法修改！");
-                        }
-                    }
-                    smileAgents.forEach(smileAgent -> {
-                        //是否是修改票提
-                        smileAgentMapper.updateAgentById(smileAgent.getId(),smileAgent.getTotalCarry(),smileAgent.getOrdCarry());
-                        SmileAgentVo smileAgentVo = new SmileAgentVo();
-                        BeanUtils.copyProperties(smileAgent, smileAgentVo);
-                        smileRedisUtils.setAgent(smileAgent.getPerformanceId(),smileAgent.getTicketId(), smileAgentVo);
-                        log.debug("create create Agent id：{},PerformanceId:{},TicketId:{}",
-                                smileAgent.getId(),
-                                smileAgent.getPerformanceId(),
-                                smileAgent.getTicketId());
-                    });
-                    return AjaxResult.success();
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    return AjaxResult.warn("请重试");
+            for (SmileAgent smileAgent : smileAgents) {
+                SmileAgentVo agent = smileRedisUtils.getAgent(smileAgent.getPerformanceId(), smileAgent.getTicketId());
+                if (agent != null) {
+                    log.info("SmileAgent:{}", agent);
+                    continue;
+                }
+                count = count - 1;
+                SmileAgentVo smileAgentVo = SmileAgentVo.getNew();
+                smileAgentVo.copy(smileAgent);
+                if ((smileAgent.getTotalCarry() == null && smileAgent.getOrdCarry() == null) ||
+                        (smileAgent.getOrdCarry().equals(BigDecimal.valueOf(0)) && smileAgent.getTotalCarry().equals(BigDecimal.valueOf(0)))) {
+                    continue;
                 }
+                smileAgentMapper.updateAgentById(smileAgentVo.getId(), smileAgentVo.getTotalCarry(), smileAgentVo.getOrdCarry());
+
+                smileRedisUtils.setAgent(smileAgent.getPerformanceId(), smileAgent.getTicketId(), smileAgentVo);
+            }
+            if (count==smileAgents.size()){
+                return AjaxResult.warn("票提一但设置，无法修改！");
             }
+            return AjaxResult.success();
         }
-        return AjaxResult.success();
+        return AjaxResult.error();
     }
 
     @Override
     public AjaxResult getAgent(String performancesId) {
         List<SmileAgentDao> smileAgentDaoList = smileAgentMapper.selectAgentList(performancesId);
-        if (smileAgentDaoList != null && smileAgentDaoList.size() > 0){
+        if (smileAgentDaoList != null && smileAgentDaoList.size() > 0) {
             return AjaxResult.success(smileAgentDaoList);
         }
         return AjaxResult.warn("演出未开启代理");

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/entity/SmileAgent.java

@@ -52,10 +52,10 @@ public class SmileAgent implements Serializable {
     private Integer delTag;
 
     public BigDecimal getTotalCarry() {
-        return totalCarry!=null?totalCarry: BigDecimal.valueOf(0);
+        return totalCarry;
     }
 
     public BigDecimal getOrdCarry() {
-        return ordCarry!=null?ordCarry: BigDecimal.valueOf(0);
+        return ordCarry;
     }
 }