Преглед изворни кода

注释优化和朗通产品订单详情代码优化

wangyu пре 6 година
родитељ
комит
6e911fedc2

+ 3 - 9
diagbotman-service/src/main/java/com/diagbot/facade/LantoneProductFacade.java

@@ -152,10 +152,10 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
         OpenedProductsIndex openedProductsIndex = new OpenedProductsIndex();
         Long curren = oppendedProductVO.getCurrent();
         Long size = oppendedProductVO.getSize();
-        if (curren == null) {
+        if (curren == null || curren==0) {
             oppendedProductVO.setCurrent(1L);
         }
-        if (size == null) {
+        if (size == null || curren==0) {
             oppendedProductVO.setSize(10L);
         }
         BeanUtil.copyProperties(oppendedProductVO, openedProductsIndex);
@@ -175,13 +175,7 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
         for (OpendProductWrapper bean : list) {
             UserOrgDTO uo = dataMap.get(bean.getUserId());
             if (uo != null) {
-                bean.setUsername(uo.getUsername());
-                bean.setLinkman(uo.getLinkman());
-                bean.setEmail(uo.getEmail());
-                bean.setOrgId(uo.getOrgId());
-                bean.setOrgName(uo.getOrgName());
-                bean.setIsReject(uo.getIsReject());
-                bean.setAuStatus(uo.getAuStatus());
+                BeanUtil.copyProperties(uo,bean);
             }
         }
         return list;

+ 1 - 7
diagbotman-service/src/main/java/com/diagbot/facade/OrderDetailsFacade.java

@@ -149,13 +149,7 @@ public class OrderDetailsFacade extends OrderDetailsServiceImpl {
         for(OrderDetailsWapper bean : list) {
             UserOrgDTO uo = dataMap.get(bean.getUserId());
             if(uo != null) {
-                bean.setUsername(uo.getUsername());
-                bean.setLinkman(uo.getLinkman());
-                bean.setEmail(uo.getEmail());
-                bean.setOrgId(uo.getOrgId());
-                bean.setOrgName(uo.getOrgName());
-                bean.setIsReject(uo.getIsReject());
-                bean.setAuStatus(uo.getAuStatus());
+                BeanUtil.copyProperties(uo,bean);
             }
         }
         return list;

+ 3 - 1
diagbotman-service/src/main/java/com/diagbot/web/DiagLantoneProductController.java

@@ -40,7 +40,9 @@ public class DiagLantoneProductController {
             notes = "name:产品名,必填<br>" +
                     "decription:产品描述,必填<br> " +
                     "url:产品访问路径,必填<br>" +
-                    "charge_type:支付方式,必填<br>")
+                    "charge_type:支付方式,必填<br>" +
+                    "access_type:接入模式,必填<br>" +
+                    "trialStatus:试用状态(是否可试用),必填<br>")
     @PostMapping("/addProducts")
     @SysLogger("addProducts")
     @Transactional