From d63453b5a1c52e44b957471035e2232d1b3d2da9 Mon Sep 17 00:00:00 2001 From: lidongdong <1459917685@qq.com> Date: 星期四, 13 十月 2022 14:47:58 +0800 Subject: [PATCH] 修改删除红圈处图片提交后,该图片附件仍然存在bug --- flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java b/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java index 8e4150a..61075fa 100644 --- a/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java +++ b/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java @@ -1,6 +1,7 @@ package com.dg.core.api; +import com.alibaba.fastjson.JSON; import com.dg.core.ResultData; import com.dg.core.annotation.Authorization; import com.dg.core.annotation.CurrentUser; @@ -8,8 +9,11 @@ import com.dg.core.db.gen.entity.GuideEvolveEntity; import com.dg.core.db.gen.entity.GuideRepairOrder; import com.dg.core.db.gen.entity.SysUser; +import com.dg.core.db.manual.mapper.util.ConstantPropertiesUtil; import com.dg.core.service.IGuideEvolveService; import com.dg.core.service.IGuideRepairOrderService; +import com.dg.core.util.SmsUtil; +import com.dg.core.util.WxUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; @@ -17,7 +21,12 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.io.IOException; import java.time.LocalDateTime; +import java.util.Map; + +import static com.dg.core.util.WxUtil.httpGet; + /** * 工单管理 @@ -33,6 +42,11 @@ @Autowired private IGuideEvolveService iGuideEvolveService; + private static String guideRepairOrderCompleteTemplateId = "7ZCHHii87rWPwVkdhZnvNiYbYi_Buq0NXO10cmUhAFk"; + + @Resource + SmsUtil smsUtil; + /** * 提交导办订单 * @return @@ -43,6 +57,7 @@ public ResultData addOrder(@RequestBody GuideRepairOrder guideRepairOrder,@CurrentUser SysUser sysUser) { guideRepairOrder.setSubmitUserId(sysUser.getUserId().toString()); guideRepairOrder.setSubmitUserPhone(sysUser.getPhonenumber()); + guideRepairOrder.setSubmitType(1); int i = iGuideRepairOrderService.addOrder(guideRepairOrder); if (i>0){ iGuideEvolveService.updateGuid(); @@ -162,6 +177,21 @@ entity.setState("8"); } else if(StringUtils.equals(entity.getState(),"4")){ + if (order.getSubmitType().equals(1))//小程序提交 + { + WxUtil wxUtil=new WxUtil(); + String accessToken="0"; + try { + accessToken= wxUtil.getBatteryCarAccessToken(); + } catch (Exception e) { + throw new RuntimeException(e); + } + SysUser submitUser = iGuideRepairOrderService.getSubmitUser(order); + wxUtil.sendGuideRepairOrderComplete(submitUser.getOpenid(),accessToken,guideRepairOrderCompleteTemplateId,order); + } + else if (order.getSubmitType().equals(2)){ + smsUtil.sendSmsComplete(order.getSubmitUserPhone(),order.getMatterName()); + } //待评价 order.setState("4"); entity.setState("9"); @@ -282,4 +312,6 @@ + + } -- Gitblit v1.7.1