Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java

@@ -222,8 +222,6 @@ public class GenerateCodeFactory {
     public static final String CODE_PREFIX_tranId = "82";
 
 
-
-
     /**
      * 只有在不调用服务生成ID时有用
      */
@@ -980,9 +978,9 @@ public class GenerateCodeFactory {
         return result;
     }
 
-    public static String getUUID(){
+    public static String getUUID() {
         UUID uuid = UUID.randomUUID();
-        return uuid.toString();
+        return uuid.toString().replaceAll("-", "");
     }
 
 }

java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java

@@ -898,7 +898,7 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
                 roomDto.setCommunityId(feeDto.getCommunityId());
                 List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
                 if (roomDtos == null || roomDtos.size() != 1) {
-                    throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "未查到房屋信息，查询多条数据");
+                    throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "未查到房屋信息，查询多条数据 roomId=" + feeDto.getPayerObjId());
                 }
                 roomDto = roomDtos.get(0);
             }

java110-db/src/main/resources/mapper/report/ReportOweFeeServiceDaoImplMapper.xml

@@ -17,7 +17,9 @@
     <select id="getReportOweFeeInfo" parameterType="Map" resultType="Map">
         select distinct(t.payer_obj_id) payerObjId
         from report_owe_fee t
+        LEFT JOIN pay_fee pf on t.fee_id = pf.fee_id
         where 1 =1
+        and pf.status_cd = '0'
         <if test="configName !=null and configName != ''">
             and t.config_name= #{configName}
         </if>
@@ -159,7 +161,9 @@
     <select id="queryReportOweFeesCount" parameterType="Map" resultType="Map">
         select count(distinct(t.payer_obj_id)) count
         from report_owe_fee t
+        LEFT JOIN pay_fee pf on t.fee_id = pf.fee_id
         where 1 =1
+        and pf.status_cd = '0'
         <if test="configName !=null and configName != ''">
             and t.config_name= #{configName}
         </if>
@@ -229,7 +233,9 @@
         communityId,t.payer_obj_type,t.payer_obj_type payerObjType,t.payer_obj_id,t.payer_obj_id payerObjId,
         t.owner_id,t.owner_id ownerId,t.owner_name,t.owner_name ownerName
         from report_owe_fee t
-        where 1 = 1
+        LEFT JOIN pay_fee pf on t.fee_id = pf.fee_id
+        where 1 =1
+        and pf.status_cd = '0'
         <if test="configName !=null and configName != ''">
             and t.config_name= #{configName}
         </if>
@@ -309,7 +315,9 @@
         from report_owe_fee t
         left join building_owner_room_rel borr on borr.room_id = t.payer_obj_id and borr.status_cd = '0'
         left join building_owner bo on borr.owner_id = bo.owner_id and bo.owner_type_cd = '1001' and bo.status_cd = '0'
-        where 1 = 1
+        LEFT JOIN pay_fee pf on t.fee_id = pf.fee_id
+        where 1 =1
+        and pf.status_cd = '0'
         <if test="configName !=null and configName != ''">
             and t.config_name= #{configName}
         </if>
@@ -388,7 +396,9 @@
         from report_owe_fee t
         left join owner_car oc on oc.car_id = t.payer_obj_id and oc.status_cd = '0'
         left join building_owner bo on oc.owner_id = bo.owner_id and bo.owner_type_cd = '1001' and bo.status_cd = '0'
-        where 1 = 1
+        LEFT JOIN pay_fee pf on t.fee_id = pf.fee_id
+        where 1 =1
+        and pf.status_cd = '0'
         <if test="configName !=null and configName != ''">
             and t.config_name= #{configName}
         </if>

java110-utils/src/main/java/com/java110/utils/constant/DomainContant.java

@@ -33,6 +33,11 @@ public class DomainContant {
     public final static String COMMON_DOMAIN = "DOMAIN.COMMON";
 
 
+    /**
+     * 公用域
+     */
+    public final static String CHINA_UMS_DOMAIN = "DOMAIN.CHINA_UMS";
+
     /**
      * 商户类型对应 权限组 管理员
      *

service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java

@@ -359,7 +359,9 @@ public class QueryWorkFlowFirstStaffBMOImpl implements IQueryWorkFlowFirstStaffB
             model.setName(oaWorkflowDtos.get(0).getFlowName());
             model.setKey("java110_" + oaWorkflowDtos.get(0).getFlowId());
             repositoryService.saveModel(model);
-            repositoryService.addModelEditorSource(model.getId(), workflowModelDto.getJson_xml().getBytes("utf-8"));
+            String jsonXml = workflowModelDto.getJson_xml();
+            jsonXml = jsonXml.replaceAll("camunda:assignee", "activiti:assignee");
+            repositoryService.addModelEditorSource(model.getId(), jsonXml.getBytes("utf-8"));
 
             InputStream svgStream = new ByteArrayInputStream(workflowModelDto.getSvg_xml().getBytes("utf-8"));
             TranscoderInput input = new TranscoderInput(svgStream);
@@ -410,7 +412,7 @@ public class QueryWorkFlowFirstStaffBMOImpl implements IQueryWorkFlowFirstStaffB
         for (Element userTask : userTasks) {
             Attribute assignee = userTask.attribute("assignee");
             if (assignee == null) {
-                userTask.addAttribute("activiti:assignee", "${nextUserId}");
+                userTask.addAttribute("camunda:assignee", "${nextUserId}");
             }
         }
 
@@ -427,6 +429,8 @@ public class QueryWorkFlowFirstStaffBMOImpl implements IQueryWorkFlowFirstStaffB
         String processIdValue = processId.getValue();
         String newXml = rootElement.asXML();
         newXml = newXml.replaceAll(processIdValue, "java110_" + workflowModelDto.getFlowId());
+
+
         workflowModelDto.setJson_xml(newXml);
     }
 

service-common/src/main/java/com/java110/common/smo/impl/OaWorkflowUserInnerServiceSMOImpl.java

@@ -18,8 +18,17 @@ import com.java110.po.oaWorkflowData.OaWorkflowDataPo;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.DateUtil;
 import com.java110.utils.util.StringUtil;
-import org.activiti.bpmn.model.*;
-import org.activiti.engine.*;
+import org.activiti.bpmn.model.BpmnModel;
+import org.activiti.bpmn.model.EndEvent;
+import org.activiti.bpmn.model.FlowElement;
+import org.activiti.bpmn.model.FlowNode;
+import org.activiti.bpmn.model.SequenceFlow;
+import org.activiti.bpmn.model.UserTask;
+import org.activiti.engine.HistoryService;
+import org.activiti.engine.ProcessEngine;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.RuntimeService;
+import org.activiti.engine.TaskService;
 import org.activiti.engine.history.HistoricProcessInstance;
 import org.activiti.engine.history.HistoricTaskInstance;
 import org.activiti.engine.history.HistoricTaskInstanceQuery;
@@ -306,7 +315,7 @@ public class OaWorkflowUserInnerServiceSMOImpl extends BaseServiceSMO implements
             oaWorkflowDataPo = new OaWorkflowDataPo();
             oaWorkflowDataPo.setBusinessKey(reqJson.getString("id"));
             oaWorkflowDataPo.setFlowId(reqJson.getString("flowId"));
-            oaWorkflowDataPo.setContext(reqJson.getString("auditMessage"));
+            oaWorkflowDataPo.setContext("");
             oaWorkflowDataPo.setDataId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_dataId));
             oaWorkflowDataPo.setEvent(OaWorkflowDataDto.EVENT_COMMIT);
             oaWorkflowDataPo.setPreDataId(preDataId);
@@ -321,6 +330,7 @@ public class OaWorkflowUserInnerServiceSMOImpl extends BaseServiceSMO implements
         oaWorkflowDataPo = new OaWorkflowDataPo();
         oaWorkflowDataPo.setDataId(oaWorkflowDataDtos.get(0).getDataId());
         oaWorkflowDataPo.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        oaWorkflowDataPo.setContext(reqJson.getString("auditMessage"));
         oaWorkflowDataInnerServiceSMOImpl.updateOaWorkflowData(oaWorkflowDataPo);
 
         //如果为-1 不插入任务
@@ -331,7 +341,7 @@ public class OaWorkflowUserInnerServiceSMOImpl extends BaseServiceSMO implements
         oaWorkflowDataPo = new OaWorkflowDataPo();
         oaWorkflowDataPo.setBusinessKey(reqJson.getString("id"));
         oaWorkflowDataPo.setFlowId(reqJson.getString("flowId"));
-        oaWorkflowDataPo.setContext(reqJson.getString("auditMessage"));
+        oaWorkflowDataPo.setContext("");
         oaWorkflowDataPo.setDataId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_dataId));
         oaWorkflowDataPo.setEvent(OaWorkflowDataDto.EVENT_COMMIT);
         oaWorkflowDataPo.setPreDataId(oaWorkflowDataDtos.get(0).getDataId());
@@ -378,12 +388,13 @@ public class OaWorkflowUserInnerServiceSMOImpl extends BaseServiceSMO implements
         oaWorkflowDataPo = new OaWorkflowDataPo();
         oaWorkflowDataPo.setDataId(oaWorkflowDataDtos.get(0).getDataId());
         oaWorkflowDataPo.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        oaWorkflowDataPo.setContext(reqJson.getString("auditMessage"));
         oaWorkflowDataInnerServiceSMOImpl.updateOaWorkflowData(oaWorkflowDataPo);
 
         oaWorkflowDataPo = new OaWorkflowDataPo();
         oaWorkflowDataPo.setBusinessKey(reqJson.getString("id"));
         oaWorkflowDataPo.setFlowId(reqJson.getString("flowId"));
-        oaWorkflowDataPo.setContext(reqJson.getString("auditMessage"));
+        oaWorkflowDataPo.setContext("");
         oaWorkflowDataPo.setDataId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_dataId));
         oaWorkflowDataPo.setEvent(OaWorkflowDataDto.EVENT_TRANSFER);
         oaWorkflowDataPo.setPreDataId(oaWorkflowDataDtos.get(0).getDataId());
@@ -448,6 +459,7 @@ public class OaWorkflowUserInnerServiceSMOImpl extends BaseServiceSMO implements
         OaWorkflowDataPo oaWorkflowDataPo = new OaWorkflowDataPo();
         oaWorkflowDataPo.setDataId(oaWorkflowDataDtos.get(0).getDataId());
         oaWorkflowDataPo.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        oaWorkflowDataPo.setContext(reqJson.getString("auditMessage"));
         oaWorkflowDataInnerServiceSMOImpl.updateOaWorkflowData(oaWorkflowDataPo);
 
         reqJson.put("nextUserId", preOaWorkflowDataDtos.get(0).getStaffId());
@@ -457,7 +469,7 @@ public class OaWorkflowUserInnerServiceSMOImpl extends BaseServiceSMO implements
         oaWorkflowDataPo = new OaWorkflowDataPo();
         oaWorkflowDataPo.setBusinessKey(preOaWorkflowDataDtos.get(0).getBusinessKey());
         oaWorkflowDataPo.setFlowId(preOaWorkflowDataDtos.get(0).getFlowId());
-        oaWorkflowDataPo.setContext(reqJson.getString("auditMessage"));
+        oaWorkflowDataPo.setContext("");
         oaWorkflowDataPo.setDataId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_dataId));
         oaWorkflowDataPo.setEvent(preOaWorkflowDataDtos.get(0).getEvent());
         oaWorkflowDataPo.setPreDataId(oaWorkflowDataDtos.get(0).getPreDataId());
@@ -550,10 +562,12 @@ public class OaWorkflowUserInnerServiceSMOImpl extends BaseServiceSMO implements
         List<SequenceFlow> outgoingFlows = flowNode.getOutgoingFlows();
         JSONObject taskObj = null;
         taskObj = new JSONObject();
+        boolean isReturn = false;
         //遍历输出连线
         for (SequenceFlow outgoingFlow : outgoingFlows) {
             //获取输出节点元素
             FlowElement targetFlowElement = outgoingFlow.getTargetFlowElement();
+            isReturn = false;
             //排除非用户任务接点
             if (targetFlowElement instanceof UserTask) {
                 //判断输出节点的el表达式
@@ -562,16 +576,17 @@ public class OaWorkflowUserInnerServiceSMOImpl extends BaseServiceSMO implements
                 if (isCondition(outgoingFlow.getConditionExpression(), vars)) {
                     //true 获取输出节点名称
                     taskObj.put("back", outgoingFlow.getTargetFlowElement().getName());
+                    isReturn = true;
                 }
                 vars.put("auditCode", "1400");
                 if (isCondition(outgoingFlow.getConditionExpression(), vars)) {
                     //true 获取输出节点名称
                     taskObj.put("backIndex", outgoingFlow.getTargetFlowElement().getName());
+                    isReturn = true;
                 }
-                vars.put("auditCode", "1100");
-                if (isCondition(outgoingFlow.getConditionExpression(), vars)) {
+                if (!isReturn) {
                     String assignee = ((UserTask) targetFlowElement).getAssignee();
-                    if (!StringUtil.isEmpty(assignee) && assignee.indexOf("${") < -1) {
+                    if (!StringUtil.isEmpty(assignee) && assignee.indexOf("${") < 0) {
                         taskObj.put("assignee", assignee); // 下一节点处理人
                     }
                 }

service-front/src/main/java/com/java110/front/smo/payment/adapt/chinaums/ChinaUmsOweFeeToNotifyAdapt.java

@@ -128,7 +128,7 @@ public class ChinaUmsOweFeeToNotifyAdapt implements IOweFeeToNotifyAdapt {
             throw new IllegalArgumentException("鉴权失败");
         }
         JSONObject billPayment = JSONObject.parseObject(map.getString("billPayment"));
-        String orderId = billPayment.get("merOrderId").toString();
+        String orderId = billPayment.get("merOrderId").toString().substring(4);
         String order = CommonCache.getAndRemoveValue(FeeDto.REDIS_PAY_OWE_FEE + orderId);
 
         if (StringUtil.isEmpty(order)) {

service-front/src/main/java/com/java110/front/smo/payment/adapt/chinaums/ChinaUmsPayAdapt.java

@@ -152,7 +152,7 @@ public class ChinaUmsPayAdapt implements IPayAdapt {
         paramMap.put("mid", smallWeChatDto.getMchId()); // 富友分配给二级商户的商户号
         paramMap.put("tid", "88880001"); //终端号
         paramMap.put("instMid", "YUEDANDEFAULT");
-        paramMap.put("merOrderId", orderNum);
+        paramMap.put("merOrderId", "1017"+orderNum);
         paramMap.put("totalAmount", PayUtil.moneyToIntegerStr(payAmount));
         paramMap.put("notifyUrl", notifyUrl + "?wId=" + WechatFactory.getWId(smallWeChatDto.getAppId()));
         paramMap.put("tradeType", tradeType);

service-job/src/main/java/com/java110/job/adapt/fee/ReturnPayFeeToChinaUmsAdapt.java

@@ -0,0 +1,186 @@
+package com.java110.job.adapt.fee;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.factory.ChinaUmsFactory;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.community.CommunityDto;
+import com.java110.dto.fee.FeeDetailDto;
+import com.java110.dto.order.BusinessDto;
+import com.java110.dto.order.OrderDto;
+import com.java110.dto.returnPayFee.ReturnPayFeeDto;
+import com.java110.dto.smallWeChat.SmallWeChatDto;
+import com.java110.entity.order.Business;
+import com.java110.intf.community.ICommunityInnerServiceSMO;
+import com.java110.intf.fee.IFeeDetailInnerServiceSMO;
+import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.fee.IReturnPayFeeInnerServiceSMO;
+import com.java110.intf.order.IOrderInnerServiceSMO;
+import com.java110.intf.store.ISmallWeChatInnerServiceSMO;
+import com.java110.intf.store.ISmallWechatAttrInnerServiceSMO;
+import com.java110.job.adapt.DatabusAdaptImpl;
+import com.java110.po.fee.ReturnPayFeePo;
+import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.DomainContant;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.PayUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 退费审核通过后 通知 银联支付平台退款处理
+ *
+ * @author fqz
+ * @Date 2021-08-19 10:12
+ */
+@Component(value = "returnPayFeeToChinaUmsAdapt")
+public class ReturnPayFeeToChinaUmsAdapt extends DatabusAdaptImpl {
+
+    @Autowired
+    private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
+
+    @Autowired
+    private IFeeDetailInnerServiceSMO feeDetailInnerServiceSMOImpl;
+
+    @Autowired
+    private IReturnPayFeeInnerServiceSMO returnPayFeeInnerServiceSMOImpl;
+
+    @Autowired
+    private ICommunityInnerServiceSMO communityInnerServiceSMO;
+
+    @Autowired
+    private ISmallWechatAttrInnerServiceSMO smallWechatAttrInnerServiceSMOImpl;
+
+    @Autowired
+    private ISmallWeChatInnerServiceSMO smallWeChatInnerServiceSMOImpl;
+
+    @Autowired
+    private IOrderInnerServiceSMO orderInnerServiceSMOImpl;
+
+    @Autowired
+    private RestTemplate outRestTemplate;
+
+    public static final String chinaUmsReturnUrl = "chinaUmsReturnUrl";
+
+    private static Logger logger = LoggerFactory.getLogger(ReturnPayFeeToChinaUmsAdapt.class);
+
+    //模板信息推送地址
+    private static String sendMsgUrl = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=";
+
+    @Override
+    public void execute(Business business, List<Business> businesses) {
+        JSONObject data = business.getData();
+        JSONArray businessReturnPayFees = null;
+        if (data.containsKey(ReturnPayFeePo.class.getSimpleName())) {
+            Object bObj = data.get(ReturnPayFeePo.class.getSimpleName());
+            if (bObj instanceof JSONObject) {
+                businessReturnPayFees = new JSONArray();
+                businessReturnPayFees.add(bObj);
+            } else if (bObj instanceof Map) {
+                businessReturnPayFees = new JSONArray();
+                businessReturnPayFees.add(JSONObject.parseObject(JSONObject.toJSONString(bObj)));
+            } else if (bObj instanceof List) {
+                businessReturnPayFees = JSONArray.parseArray(JSONObject.toJSONString(bObj));
+            } else {
+                businessReturnPayFees = (JSONArray) bObj;
+            }
+        } else {
+            return;
+        }
+
+        if (businessReturnPayFees == null) {
+            return;
+        }
+        for (int bReturnPayFeeIndex = 0; bReturnPayFeeIndex < businessReturnPayFees.size(); bReturnPayFeeIndex++) {
+            JSONObject businessReturnPayFee = businessReturnPayFees.getJSONObject(bReturnPayFeeIndex);
+            doPayFeeToChinaUms(business, businessReturnPayFee);
+        }
+    }
+
+    /**
+     * 通知退款
+     *
+     * @param business
+     * @param businessReturnPayFee
+     */
+    public void doPayFeeToChinaUms(Business business, JSONObject businessReturnPayFee) {
+
+        Assert.hasKeyAndValue(businessReturnPayFee, "returnFeeId", "未包含退费ID");
+        Assert.hasKeyAndValue(businessReturnPayFee, "communityId", "未包含小区ID");
+        //查询小区信息
+        CommunityDto communityDto = new CommunityDto();
+        communityDto.setCommunityId(businessReturnPayFee.getString("communityId"));
+        List<CommunityDto> communityDtos = communityInnerServiceSMO.queryCommunitys(communityDto);
+        Assert.listOnlyOne(communityDtos, "查询小区错误！");
+
+        //校验退费审核是否为通过
+        ReturnPayFeeDto returnPayFeeDto = new ReturnPayFeeDto();
+        returnPayFeeDto.setReturnFeeId(businessReturnPayFee.getString("returnFeeId"));
+        returnPayFeeDto.setCommunityId(businessReturnPayFee.getString("communityId"));
+        returnPayFeeDto.setState("1100");
+        List<ReturnPayFeeDto> returnPayFeeDtos = returnPayFeeInnerServiceSMOImpl.queryReturnPayFees(returnPayFeeDto);
+
+        if (returnPayFeeDtos == null || returnPayFeeDtos.size() < 1) {
+            return;//说明没有退款成功
+        }
+
+        //查询缴费明细表
+        FeeDetailDto feeDetailDto = new FeeDetailDto();
+        feeDetailDto.setDetailId(returnPayFeeDtos.get(0).getDetailId());
+        feeDetailDto.setCommunityId(returnPayFeeDtos.get(0).getCommunityId());
+        List<FeeDetailDto> feeDetailDtos = feeDetailInnerServiceSMOImpl.queryFeeDetails(feeDetailDto);
+
+        Assert.listOnlyOne(feeDetailDtos, "缴费明细不存在");
+
+        //查询缴费订单号
+        BusinessDto businessDto = new BusinessDto();
+        businessDto.setbId(feeDetailDtos.get(0).getbId());
+        List<OrderDto> orderDtos = orderInnerServiceSMOImpl.queryOrderByBId(businessDto);
+
+        Assert.listOnlyOne(orderDtos, "订单不存在");
+
+        //查询公众号配置
+        SmallWeChatDto smallWeChatDto = new SmallWeChatDto();
+        smallWeChatDto.setObjType(SmallWeChatDto.OBJ_TYPE_COMMUNITY);
+        smallWeChatDto.setObjId(communityDto.getCommunityId());
+        List<SmallWeChatDto> smallWeChatDtos = smallWeChatInnerServiceSMOImpl.querySmallWeChats(smallWeChatDto);
+        if (smallWeChatDto == null || smallWeChatDtos.size() <= 0) {
+            logger.info("未配置微信公众号信息,定时任务执行结束");
+            return;
+        }
+
+
+        JSONObject paramMap = new JSONObject();
+        paramMap.put("requestTimestamp", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        paramMap.put("msgId", GenerateCodeFactory.getUUID()); // 富友分配给二级商户的商户号
+        paramMap.put("mid", smallWeChatDtos.get(0).getMchId()); // 富友分配给二级商户的商户号
+        paramMap.put("tid", "88880001"); //终端号
+        paramMap.put("instMid", "YUEDANDEFAULT");
+        paramMap.put("merOrderId", "1017" + orderDtos.get(0).getoId());
+        paramMap.put("refundOrderId", feeDetailDtos.get(0).getDetailId());
+        paramMap.put("refundAmount", PayUtil.moneyToIntegerStr(Double.parseDouble(feeDetailDtos.get(0).getReceivedAmount())));
+
+
+        logger.debug("调用支付统一下单接口" + paramMap.toJSONString());
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Content-Type", "application/json");
+        headers.add("Authorization", ChinaUmsFactory.getAccessToken());
+        HttpEntity httpEntity = new HttpEntity(paramMap.toJSONString(), headers);
+        ResponseEntity<String> responseEntity = outRestTemplate.exchange(
+                MappingCache.getValue(DomainContant.CHINA_UMS_DOMAIN, chinaUmsReturnUrl), HttpMethod.POST, httpEntity, String.class);
+
+        logger.debug("退款 请求报文：" + paramMap.toJSONString() + ",返回报文：" + responseEntity);
+
+    }
+}

service-job/src/main/java/com/java110/job/task/fee/GenerateBillProTemplate.java

@@ -162,7 +162,7 @@ public class GenerateBillProTemplate extends TaskSystemQuartz {
         BillDto billDto = new BillDto();
         billDto.setBillId(billId);
         billDto.setBillName(feeConfigDto.getFeeName() + "-" + DateUtil.getFormatTimeString(new Date(), DateUtil.DATE_FORMATE_STRING_H));
-        billDto.setBillTime(DateUtil.getFormatTimeString(new Date(), DateUtil.DATE_FORMATE_STRING_A));
+        billDto.setBillTime(DateUtil.getFormatTimeString(new Date(), DateUtil.DATE_FORMATE_STRING_B));
         billDto.setCommunityId(feeConfigDto.getCommunityId());
         billDto.setConfigId(feeConfigDto.getConfigId());
         billDto.setCurBill("T");