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

lidongdong

2022-12-08 c1d1c4dd78ea55a4a364b761826470212f79bdb0

 flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java

@@ -243,9 +243,10 @@
                }
                SysUser submitUser = iGuideRepairOrderService.getSubmitUser(order);
                wxUtil.sendGuideRepairOrderComplete(submitUser.getOpenid(),accessToken,guideRepairOrderCompleteTemplateId,entity);
                smsUtil.sendSmsCompleteNew(order.getConsultUserPhone(),order.getMatterName());
            }
            else if (order.getSubmitType().equals(2)){
                smsUtil.sendSmsComplete(order.getConsultUserPhone(),order.getMatterName());
                smsUtil.sendSmsCompleteNew(order.getConsultUserPhone(),order.getMatterName());
            }
            order.setState("4");
            entity.setState("7");