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

src/main/java/com/huiju/estateagents/sample/controller/TaH5DemandController.java

@@ -132,12 +132,6 @@ public class TaH5DemandController extends BaseController {
     public ResponseBean taH5DemandAdd(@RequestBody TaH5Demand taH5Demand, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            TaH5Sample sample = iTaH5SampleService.getById(taH5Demand.getSampleId());
-            if (sample.getStatus() != 1){
-                responseBean.addError("该H5样例已取消发布或已删除");
-                return responseBean;
-            }
-
             taH5Demand.setOrgId(getOrgId(request));
             taH5Demand.setOrgName(iTaOrgService.getById(getOrgId(request)).getName());
             taH5Demand.setDemandStatus(CommConstant.STATUS_NORMAL);
@@ -155,7 +149,7 @@ public class TaH5DemandController extends BaseController {
             if (sampleContactList.size() > 0) {
                 List<TaContact> taContactList = taContactService.list(new QueryWrapper<TaContact>().in("contact_id", sampleContactList.stream().map(TaSampleContact::getContactId).collect(Collectors.toList())));
                 taH5Sample.setTaContactList(taContactList);
-                String[] smsParams = {taH5Sample.getSampleName(), taH5Demand.getOrderer() + taH5Demand.getPhone()};
+                String[] smsParams = {taH5Sample.getSampleName(), taH5Demand.getOrderer() + "-" + taH5Demand.getPhone()};
                 for (TaContact taContact : taContactList){
                     sendSmsMessage(taContact.getPhone(), CommConstant.MESSAGE_CONTENT_OF_DEMAND, smsParams);
                 }

src/main/java/com/huiju/estateagents/sample/controller/TaH5SampleController.java

@@ -191,6 +191,12 @@ public class TaH5SampleController extends BaseController {
     public ResponseBean taH5SampleGet(@PathVariable Integer id, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
+            TaH5Sample sample = iTaH5SampleService.getById(id);
+            if (sample.getStatus() != 1){
+                responseBean.addError("该H5样例已取消发布或已删除");
+                return responseBean;
+            }
+
             TaH5Sample taH5Sample = iTaH5SampleService.getById(id);
             QueryWrapper<TaH5Demand> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("sample_id", id);
@@ -306,7 +312,7 @@ public class TaH5SampleController extends BaseController {
             List<TaSampleContact> sampleContactList = iTaSampleContactService.list(queryWrapper);
             if (sampleContactList.size() > 0) {
                 List<TaContact> taContactList = taContactService.list(new QueryWrapper<TaContact>()
-                        .in("contact_ id", sampleContactList.stream().map(TaSampleContact::getContactId).collect(Collectors.toList()))
+                        .in("contact_id", sampleContactList.stream().map(TaSampleContact::getContactId).collect(Collectors.toList()))
                         .eq("status",CommConstant.STATUS_NORMAL));
                 taH5Sample.setTaContactList(taContactList);
             }