Merge branch 'develop'

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/dto/ServiceOrderFormDTO.java

@@ -78,4 +78,7 @@ public class ServiceOrderFormDTO {
 
     @ApiModelProperty(value = "接单人基本信息")
     private UserBaseInfoDTO orderReceive;
+
+    @ApiModelProperty(value = "订单项目号")
+    private String projectCode;
 }

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/dto/ServiceOrderFormDetailsDTO.java

@@ -116,4 +116,7 @@ public class ServiceOrderFormDetailsDTO {
 
     @ApiModelProperty(value = "1:双方无责 2:发布者责任 3：飞手责任")
     private Integer duty;
+
+    @ApiModelProperty(value = "订单对应的项目号")
+    private String projectCode;
 }

csf-common/csf-common-model/src/main/java/com/mmc/csf/infomation/vo/ServiceRequirementsVO.java

@@ -116,5 +116,6 @@ public class ServiceRequirementsVO implements Serializable {
     @ApiModelProperty(value = "订单总共需要多少人")
     private Integer requireNum;
 
-
+    @ApiModelProperty(value = "订单项目号")
+    private String projectCode;
 }

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: 2be3719499c95de7b3ec6f387ae1e0dd1e0aa2aa
+  newTag: 4f378f9545a0a77c8b9ae9aa198de2befdf42a82

release-service/src/main/java/com/mmc/csf/release/controller/RequirementsController.java

@@ -234,6 +234,14 @@ public class RequirementsController extends BaseController {
     public ResultBody updateTaskUrl(@RequestBody UpdateTaskUrlVO updateTaskUrlVO) {
         return requirementsService.updateTaskUrl(updateTaskUrlVO.getTaskUrl(),updateTaskUrlVO.getRequirementsInfoId());
     }
+
+    @ApiOperation(value = "查看原来图片凭证")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("getTaskUrl")
+    public ResultBody getTaskUrl(@ApiParam(value = "发布服务需求id", required = true) @RequestParam Integer requirementsInfoId) {
+        return requirementsService.getTaskUrl(requirementsInfoId);
+    }
+
     @ApiOperation(value = "new——小程序-—发布者--订单结算")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping("settleAccounts")

release-service/src/main/java/com/mmc/csf/release/dao/RequirementsDao.java

@@ -126,6 +126,7 @@ public interface RequirementsDao {
 
     void updateTaskUrl(@Param("taskUrl") String taskUrl,@Param("requirementsInfoId") Integer requirementsInfoId);
 
+    String getTaskUrl(Integer requirementsInfoId);
     ServiceFulfilATaskDO fulfilATaskDetails(Integer requirementsInfoId, Integer userAccountId);
 
     void settleAccounts(ServiceSettleAccountsDO settleAccountsDO);

release-service/src/main/java/com/mmc/csf/release/entity/requirements/OrderAmountDetailDO.java

@@ -77,6 +77,12 @@ public class OrderAmountDetailDO implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date workDate;
 
+    @ApiModelProperty(value = "其他")
+    private BigDecimal otherSubsidy;
+
+    @ApiModelProperty(value = "备注，解释为什么有其他费用")
+    private String remark;
+
     private static final long serialVersionUID = 1L;
 
     /**

release-service/src/main/java/com/mmc/csf/release/entity/requirements/ServiceOrderFormDO.java

@@ -72,6 +72,9 @@ public class ServiceOrderFormDO {
     @ApiModelProperty(value = "父订单id")
     private Integer fatherRequireId;
 
+    @ApiModelProperty(value = "订单对应项目号")
+    private String projectCode;
+
     public ServiceOrderFormDTO buildServiceOrderForm() {
         return ServiceOrderFormDTO.builder()
                 .id(this.id)
@@ -89,6 +92,7 @@ public class ServiceOrderFormDO {
                 .orderStatus(this.orderStatus)
                 .waiting(this.waiting)
                 .fatherRequireId(this.fatherRequireId)
+                .projectCode(this.projectCode)
                 .build();
     }
 

release-service/src/main/java/com/mmc/csf/release/entity/requirements/ServiceOrderFormDetailsDO.java

@@ -113,6 +113,8 @@ public class ServiceOrderFormDetailsDO {
     private Integer duty;
 
 
+    @ApiModelProperty(value = "订单对应的项目号")
+    private String projectCode;
 
 
     public ServiceOrderFormDetailsDTO buildOrderFormDetails() {
@@ -143,6 +145,7 @@ public class ServiceOrderFormDetailsDO {
                 .orderEarnings(this.orderEarnings)
                 .duty(this.duty)
                 .decisionContent(this.decisionContent)
+                .projectCode(this.projectCode)
                 .build();
     }
 }

release-service/src/main/java/com/mmc/csf/release/entity/requirements/ServiceRequirementsDO.java

@@ -148,6 +148,8 @@ public class ServiceRequirementsDO {
     @ApiModelProperty(value = "订单总共所需多少人")
     private Integer requireNum;
 
+    @ApiModelProperty(value = "订单项目号")
+    private String projectCode;
     public ServiceRequirementsDO(ServiceRequirementsVO serviceRequirementsVO) {
         this.id = serviceRequirementsVO.getId();
         this.userAccountId = serviceRequirementsVO.getUserAccountId();
@@ -175,6 +177,7 @@ public class ServiceRequirementsDO {
         this.cityCode = serviceRequirementsVO.getCityCode();
         this.districtCode = serviceRequirementsVO.getDistrictCode();
         this.requireNum = serviceRequirementsVO.getRequireNum();
+        this.projectCode = serviceRequirementsVO.getProjectCode();
     }
 
 

release-service/src/main/java/com/mmc/csf/release/entity/requirements/ServiceRequirementsSonDO.java

@@ -148,6 +148,8 @@ public class ServiceRequirementsSonDO {
     @ApiModelProperty(value = "上级订单id")
     private Integer fatherRequireId;
 
+    @ApiModelProperty(value = "订单项目号")
+    private String projectCode;
     public ServiceRequirementsSonDO(ServiceRequirementsDO serviceRequirementsDO) {
         BigDecimal decimalSum = new BigDecimal(serviceRequirementsDO.getRequireNum());
         this.serviceId = serviceRequirementsDO.getServiceId();
@@ -184,5 +186,6 @@ public class ServiceRequirementsSonDO {
         this.serviceName = serviceRequirementsDO.getServiceName();
         this.requireNum = 1;
         this.fatherRequireId = serviceRequirementsDO.getId();
+        this.projectCode = serviceRequirementsDO.getProjectCode();
     }
 }

release-service/src/main/java/com/mmc/csf/release/service/RequirementsService.java

@@ -90,6 +90,7 @@ public interface RequirementsService {
 
     ResultBody updateTaskUrl(String taskUrl,Integer requirementsInfoId);
 
+    ResultBody getTaskUrl(Integer requirementsInfoId);
     ResultBody<ServiceFulfilATaskDTO> fulfilATaskDetails(Integer requirementsInfoId, Integer userAccountId);
 
     ResultBody settleAccounts(ServiceSettleAccountsVO settleAccountsVO, HttpServletRequest request);

release-service/src/main/java/com/mmc/csf/release/service/impl/BackstageForumServiceImpl.java

@@ -222,7 +222,8 @@ public class BackstageForumServiceImpl implements BackstageForumService {
             WxMsgVO ws = new WxMsgVO();
             ws.setDataObject(spellMsg("发布帖子","审核通过"));
             ws.setUserAccountId(dynamicDO.getUserAccountId());
-            ws.setTemplateId("9qvgBhfW9yoQJY91iMfhrog8y5eZUPSbo9PLvQzS_vk");
+//            ws.setTemplateId("9qvgBhfW9yoQJY91iMfhrog8y5eZUPSbo9PLvQzS_vk");
+            ws.setTemplateId("4s0xcovQfT89MYPkUEesBsPD_ONRMPsx_9jxi61Qd-c");
             userAppApi.feignSendWxMsg(token, ws);
         } else {
             dynamicDao.updateCheckDynamic(dynamicId, 2);

release-service/src/main/java/com/mmc/csf/release/service/impl/RequirementsServiceImpl.java

@@ -3177,33 +3177,38 @@ public class RequirementsServiceImpl implements RequirementsService {
             return ResultBody.error("没有查到这个订单");
         }
 
-        String taskUrl1 = serviceFulfilATaskDO.getTaskUrl();
-        if(StringUtils.isEmpty(taskUrl1)){
-            String newTaskUrl = taskUrl;
-            requirementsDao.updateTaskUrl(newTaskUrl,requirementsInfoId);
-            return ResultBody.success();
-        }
-        taskUrl = taskUrl.replace("\\","");
-        // 解析为JSON数组
-        JsonArray jsonArray1 = new Gson().fromJson(taskUrl1, JsonArray.class);
-        JsonArray jsonArray2 = new Gson().fromJson(taskUrl, JsonArray.class);
-
-        // 合并JSON数组
-        JsonArray mergedArray = new JsonArray();
-        for (int i = 0; i < jsonArray1.size(); i++) {
-            mergedArray.add(jsonArray1.get(i));
-        }
-        for (int i = 0; i < jsonArray2.size(); i++) {
-            mergedArray.add(jsonArray2.get(i));
-        }
-
-        // 转换为字符串形式
-        String newTaskUrl = mergedArray.toString();
-        requirementsDao.updateTaskUrl(newTaskUrl,requirementsInfoId);
+//        String taskUrl1 = serviceFulfilATaskDO.getTaskUrl();
+//        if(StringUtils.isEmpty(taskUrl1)){
+//            String newTaskUrl = taskUrl;
+//            requirementsDao.updateTaskUrl(newTaskUrl,requirementsInfoId);
+//            return ResultBody.success();
+//        }
+//        taskUrl = taskUrl.replace("\\","");
+//        // 解析为JSON数组
+//        JsonArray jsonArray1 = new Gson().fromJson(taskUrl1, JsonArray.class);
+//        JsonArray jsonArray2 = new Gson().fromJson(taskUrl, JsonArray.class);
+//
+//        // 合并JSON数组
+//        JsonArray mergedArray = new JsonArray();
+//        for (int i = 0; i < jsonArray1.size(); i++) {
+//            mergedArray.add(jsonArray1.get(i));
+//        }
+//        for (int i = 0; i < jsonArray2.size(); i++) {
+//            mergedArray.add(jsonArray2.get(i));
+//        }
+//
+//        // 转换为字符串形式
+//        String newTaskUrl = mergedArray.toString();
+        requirementsDao.updateTaskUrl(taskUrl,requirementsInfoId);
         return ResultBody.success();
     }
 
     @Override
+    public ResultBody getTaskUrl(Integer requirementsInfoId) {
+        return ResultBody.success(requirementsDao.getTaskUrl(requirementsInfoId));
+    }
+
+    @Override
     public ResultBody<ServiceFulfilATaskDTO> fulfilATaskDetails(Integer requirementsInfoId, Integer userAccountId) {
         ServiceFulfilATaskDO serviceFulfilATaskDO = requirementsDao.fulfilATaskDetails(requirementsInfoId, userAccountId);
         ServiceFulfilATaskDTO serviceFulfilATaskDTO = serviceFulfilATaskDO.buildServiceFulfilATaskDTO();

release-service/src/main/resources/application-dev.yml

@@ -78,8 +78,8 @@ spring:
 
 wx:
   sub:
-    appid: wx5c6a105a0ddca4c5
-    secret: 96c75255dd26f82f8d55e15b59e101c7
+    appid: wx50b22db275f8c320
+    secret: 7b609851705dd22114fff636d0a2fc4a
   app:
     id: wx18b7883acd204278
     secret: 28afe74ba373830237a8133a7431ee82

release-service/src/main/resources/application-local.yml

@@ -77,8 +77,8 @@ spring:
 
 wx:
   sub:
-    appid: wx5c6a105a0ddca4c5
-    secret: 96c75255dd26f82f8d55e15b59e101c7
+    appid: wx50b22db275f8c320
+    secret: 7b609851705dd22114fff636d0a2fc4a
   app:
     id: wx18b7883acd204278
     secret: 28afe74ba373830237a8133a7431ee82

release-service/src/main/resources/application-prod.yml

@@ -132,8 +132,8 @@ ribbon:
 
 wx:
   sub:
-    appid: wx5c6a105a0ddca4c5
-    secret: ${WECHAT_SUB_SECRET}
+    appid: wx50b22db275f8c320
+    secret: 7b609851705dd22114fff636d0a2fc4a
   app:
     id: wx18b7883acd204278
     secret: ${WECHAT_APPLET_SECRET}

release-service/src/main/resources/mapper/requirements/BackRequirementsDao.xml

@@ -70,7 +70,8 @@
         ri.service_id,
         ri.service_name,
         sf.order_status,
-        sf.waiting
+        sf.waiting,
+        ri.project_code
         FROM
         requirements_info ri
         LEFT JOIN requirements_amount ra ON ri.id = ra.requirements_info_id
@@ -188,6 +189,7 @@
             ri.task_address,
             ri.latitude,
             ri.longitude,
+            ri.project_code,
             ra.cash_amount,
             ra.salary_amount,
             ra.we_chat,

release-service/src/main/resources/mapper/requirements/OrderAmountDetailDao.xml

@@ -21,7 +21,7 @@
         id,requirements_info_id,daily_wage,
         subsidy_festival,rental_subsidy,traffic_subsidy,
         high_temperature_subsidy,settle_accounts_proportion,real_wages,
-        work_date,create_time,update_time
+        work_date,create_time,update_time,other_subsidy,remark
     </sql>
 
 
@@ -53,12 +53,12 @@
     <insert id="batchInsert" parameterType="java.util.List">
         insert into order_amount_detail
         (id, requirements_info_id, daily_wage, subsidy_festival, rental_subsidy, traffic_subsidy,
-        high_temperature_subsidy, settle_accounts_proportion, real_wages, work_date, create_time)
+        high_temperature_subsidy, settle_accounts_proportion, real_wages, work_date, create_time,other_subsidy,remark)
         values
         <foreach collection="list" item="item" separator=",">
             (#{item.id}, #{item.requirementsInfoId}, #{item.dailyWage}, #{item.subsidyFestival}, #{item.rentalSubsidy},
             #{item.trafficSubsidy}, #{item.highTemperatureSubsidy}, #{item.settleAccountsProportion}, #{item.realWages},
-            #{item.workDate}, NOW())
+            #{item.workDate}, NOW(),#{item.otherSubsidy},#{item.remark})
         </foreach>
     </insert>
 

release-service/src/main/resources/mapper/requirements/RequirementsDao.xml

@@ -519,12 +519,12 @@
                                       require_description, create_time,
                                       update_time, task_start_time, task_end_time, task_address, longitude,
                                       latitude, publisher_number, insurance, publish,
-                                      service_flow_id, adcode, order_level_amount, openid, service_name,province_code,city_code,district_code,require_num,repertory)
+                                      service_flow_id, adcode, order_level_amount, openid, service_name,province_code,city_code,district_code,require_num,repertory,project_code)
         VALUES (#{serviceId}, #{userAccountId}, #{publishName}, #{publishPhone},
                 #{requireDescription}, NOW(),
                 NOW(), #{taskStartTime}, #{taskEndTime}, #{taskAddress}, #{longitude},
                 #{latitude}, #{publisherNumber}, #{insurance}, 1, 1, #{adcode}, #{orderLevelAmount}, #{openid},
-                #{serviceName},#{provinceCode},#{cityCode},#{districtCode},#{requireNum},#{repertory});
+                #{serviceName},#{provinceCode},#{cityCode},#{districtCode},#{requireNum},#{repertory},#{projectCode});
     </insert>
 
     <insert id="addPublishServiceSon" parameterType="com.mmc.csf.release.entity.requirements.ServiceRequirementsSonDO"
@@ -533,12 +533,12 @@
                                       require_description, create_time,
                                       update_time, task_start_time, task_end_time, task_address, longitude,
                                       latitude, publisher_number, insurance, publish,
-                                      service_flow_id, adcode, order_level_amount, openid, service_name,province_code,city_code,district_code,father_require_id)
+                                      service_flow_id, adcode, order_level_amount, openid, service_name,province_code,city_code,district_code,father_require_id,project_code)
         VALUES (#{serviceId}, #{userAccountId}, #{publishName}, #{publishPhone},
                 #{requireDescription}, NOW(),
                 NOW(), #{taskStartTime}, #{taskEndTime}, #{taskAddress}, #{longitude},
                 #{latitude}, #{publisherNumber}, #{insurance}, 1, 1, #{adcode}, #{orderLevelAmount}, #{openid},
-                #{serviceName},#{provinceCode},#{cityCode},#{districtCode},#{fatherRequireId});
+                #{serviceName},#{provinceCode},#{cityCode},#{districtCode},#{fatherRequireId},#{projectCode});
     </insert>
 
     <insert id="addAmount" parameterType="com.mmc.csf.release.entity.requirements.RequirementsAmountDO"
@@ -1702,6 +1702,11 @@
         where requirements_info_id = #{requirementsInfoId}
     </update>
 
+    <select id="getTaskUrl" resultType="java.lang.String">
+        select task_url from service_fulfil_a_task
+        where requirements_info_id = #{requirementsInfoId}
+    </select>
+
     <insert id="insertAgreePilotOrder">
         insert into agree_pilot_order(require_info_id, service_flow_id, pilot_certification_user_id, create_time)
         values(#{requireInfoId},#{serviceFlowId},#{pilotCertificationUserId},NOW())
@@ -1871,7 +1876,8 @@
         ri.province_code,
         ri.city_code,
         ri.district_code,
-        ri.service_flow_id
+        ri.service_flow_id,
+        ri.project_code
         FROM requirements_info ri
         LEFT JOIN requirements_amount ra
         ON ra.requirements_info_id = ri.id AND ri.user_account_id = ra.user_account_id
@@ -2196,6 +2202,7 @@
         WHERE ri.user_account_id = #{userAccountId}
             AND ri.id = #{requirementsInfoId}
     </select>
+
     <delete id="deleteRequirementsServiceInfo">
         delete from requirements_service  where requirements_info_id = #{requireId} and pilot_certification_user_id = #{userAccountId}
     </delete>

release-service/src/main/resources/not-check.yml

@@ -48,4 +48,5 @@ data-filter:
     - /release/curriculum/curriculumDetails
     - /release/backstage/forum/getNotCheckDynamicSum
     - /release/dynamic/dynamicList1
+    - /release/curriculum/selectCurriculumClassify