Merge remote-tracking branch 'origin/developer_bw' into developer_bw

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/HygfIcbcServiceImpl.java

@@ -191,6 +191,12 @@ public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbc
 			request.setBizContent(bizContent);
 			// 调用工行 SDK，生成自动提交表单，将用户跳转到收方入驻页面
 			log.info("聚富通委托代扣签约同步开户页面接口V1, 入参 => {}", JSON.toJSONString(request));
+			//添加上送日志存储
+			HygfIcbcRequest hygfIcbcRequest = new HygfIcbcRequest();
+			hygfIcbcRequest.setPhase("请求");
+			hygfIcbcRequest.setContent(JSONObject.toJSONString(request));
+			hygfIcbcRequest.setRecDate(new Date());	
+			hygfIcbcRequestMapper.insert(hygfIcbcRequest);
 			String form = client.buildPostForm(request);
 			log.info("聚富通委托代扣签约同步开户页面接口V1, 响应 => {}", form);
 			resp.setHeader("Content-Type", "text/html;charset=" + IcbcConstants.CHARSET_UTF8);

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpInverterServiceImpl.java

@@ -209,6 +209,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
             Date date1 = new Date(tdHYGFInverterDayGenerate.getCreatedTime());
             tdHYGFInverterDayGenerate.setCreatedTimeStr(DateUtil.format(date1, DatePattern.NORM_DATETIME_PATTERN));
             tdHYGFInverterDayGenerate.setTotalGen(tdHYGFInverterDayGenerate.getTotalGen() == null ? 0:Double.valueOf(String.format("%.3f",tdHYGFInverterDayGenerate.getTotalGen()/1000)));
+            tdHYGFInverterDayGenerate.setTotalPower(tdHYGFInverterDayGenerate.getTotalPower() == null ? 0:Double.valueOf(String.format("%.3f",tdHYGFInverterDayGenerate.getTotalPower())));
             tdHYGFInverterDayGenerate.setRegionalCompaniesName(regionalCompaniesNameMap.get(tdHYGFInverterDayGenerate.getRegionalCompaniesCode()));
         });
 
@@ -295,6 +296,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
             tdHYGFInverterDayGenerate.setCreatedTimeStr(DateUtil.format(date1, DatePattern.NORM_DATETIME_PATTERN));
             tdHYGFInverterDayGenerate.setTotalGen(tdHYGFInverterDayGenerate.getTotalGen() == null ? 0:Double.valueOf(String.format("%.3f",tdHYGFInverterDayGenerate.getTotalGen()/1000)));
             tdHYGFInverterDayGenerate.setRegionalCompaniesName(regionalCompaniesNameMap.get(tdHYGFInverterDayGenerate.getRegionalCompaniesCode()));
+            tdHYGFInverterDayGenerate.setTotalPower(tdHYGFInverterDayGenerate.getTotalPower() == null ? 0:Double.valueOf(String.format("%.3f",tdHYGFInverterDayGenerate.getTotalPower())));
         });
         return tdHYGFInverterDayGenerates;
     }