机构类型

src/main/java/com/zswl/dataservice/service/mqtt/ProjectInfoService.java

@@ -46,8 +46,10 @@ public class ProjectInfoService extends SuperService {
         if (ObjectUtils.isEmpty(projectInfo)) {
             projectInfo = new ProjectInfo();
             initEntity(projectInfo);
+            BeanUtils.copyProperties(param, projectInfo, "id");
+        }else {
+            BeanUtils.copyProperties(param, projectInfo, "id", "createTime", "updateTime", "isDelete");
         }
-        BeanUtils.copyProperties(param, projectInfo, "id");
         projectInfoDao.save(projectInfo);
         return ResultContent.buildSuccess(projectInfo);
     }

src/main/java/com/zswl/dataservice/service/payment/HxzService.java

@@ -82,7 +82,7 @@ public class HxzService extends SuperService {
      * @param dataStr
      * @return
      */
-    @ExecuteAnnotationServiceMethod(value = "consum", remark = "云版消费机 用户刷卡综合接口")
+    @ExecuteAnnotationServiceMethod(value = "ConsumTransactions", remark = "云版消费机 2.2 用户刷卡综合接口")
     public ResultContent<Object> consumTransactions(String dataStr) {
         ConsumTransactionsModel params = JSONUtil.toBean(dataStr, ConsumTransactionsModel.class);
 
@@ -112,21 +112,19 @@ public class HxzService extends SuperService {
         return ResultContent.buildSuccess(ret);
     }
 
-    @ExecuteAnnotationServiceMethod(value = "orderquery", remark = "云版消费机 用户刷卡消费结果查询接口")
+    @ExecuteAnnotationServiceMethod(value = "orderQuery", remark = "云版消费机 2.3 用户刷卡消费结果查询接口")
     public ResultContent<Object> orderQuery(String dataStr) {
         OrderQueryResult result = new OrderQueryResult();
 
         return ResultContent.buildSuccess(result);
     }
 
-    @ExecuteAnnotationServiceMethod(value = "qrcodeconsum", remark = "云版消费机 用户刷卡消费结果查询接口")
-    public ResultContent<Object> qrcodeconsum(String dataStr) {
-        OrderQueryResult result = new OrderQueryResult();
-
-        return ResultContent.buildSuccess(result);
-    }
-
-    @ExecuteAnnotationServiceMethod(value = "QRCodeTransaction", remark = "云版消费机 付款码（二维码）支付接口")
+    /**
+     * 付款码（二维码）
+     * @param dataStr
+     * @return
+     */
+    @ExecuteAnnotationServiceMethod(value = "QRCodeTransaction", remark = "云版消费机 2.7 付款码（二维码）支付接口")
     public ResultContent<Object> QRCodeTransaction(String dataStr) {
         QRCodeTransactionModel params = JSONUtil.toBean(dataStr, QRCodeTransactionModel.class);