更新

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/payment/HxzController.java

@@ -38,7 +38,7 @@ public class HxzController {
 
     @Operation(summary = "用户刷卡综合接口")
     @PostMapping(value = "ConsumTransactions", consumes = MediaType.APPLICATION_JSON_VALUE)
-    public ResultContent consumTransactions(@RequestBody ConsumTransactionsFullParam param) {
+    public ResultContent consumTransactions(@RequestBody ConsumTransactionsModel param) {
         return hxzService.consumTransactions(param);
     }
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/ExpenseFlowServiceImpl.java

@@ -94,11 +94,12 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
     /**
      * 创建订单
      *
-     * @param param
+     * @param iotParam
      * @return
      */
-    public ResultContent<ExpenseFlow> createExpenseFlowByHxz(ConsumTransactionsFullParam param, ExpenseFlow expenseFlow) {
-        ConsumTransactionsModel iotParam = param.getParam();
+    public ResultContent<ExpenseFlow> createExpenseFlowByHxz(
+            ConsumTransactionsModel iotParam,
+            ExpenseFlow expenseFlow) {
         expenseFlow.setMqttDataId(iotParam.getMqttDataId());
 
         expenseFlow.setYear(DateUtils.paresTime(System.currentTimeMillis(), DateUtils.patternyyyy));
@@ -122,8 +123,8 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
 
         expenseFlow.setOrderFromType(OrderFromType.Swipe);
         // 支付方式
-        expenseFlow.setPaymentWay(param.getPaymentType().getRemark());
-        expenseFlow.setPaymentType(param.getPaymentType());
+        expenseFlow.setPaymentWay(iotParam.getPaymentType().getRemark());
+        expenseFlow.setPaymentType(iotParam.getPaymentType());
         expenseFlow.setParam(iotParam);
         expenseFlow.setPaymentDeviceType(PaymentDeviceType.HxzConsumTransactions);
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/HxzService.java

@@ -75,20 +75,16 @@ public class HxzService extends SuperService {
      * @param param
      * @return
      */
-    public ResultContent consumTransactions(ConsumTransactionsFullParam param) {
+    public ResultContent consumTransactions(ConsumTransactionsModel param) {
         // 返回参数
-        ConsumTransactionsFullResult result = new ConsumTransactionsFullResult();
-        result.setPaymentType(param.getPaymentType());
         ConsumTransactionsResult resultModel = new ConsumTransactionsResult();
 
-        ConsumTransactionsModel param1 = param.getParam();
-        String mqttDataId = param1.getMqttDataId();
+        String mqttDataId = param.getMqttDataId();
         ExpenseFlow expenseFlow = expenseFlowService.init(mqttDataId);
 
         if (ObjectUtils.isEmpty(expenseFlow)) {
             resultModel.setFailed("重复订单");
-            result.setModel(resultModel);
-            return ResultContent.buildSuccess(JSONUtil.toJsonStr(result));
+            return ResultContent.buildSuccess(JSONUtil.toJsonStr(resultModel));
         }
         // 创建订单
         ResultContent<ExpenseFlow> createResult = expenseFlowService.createExpenseFlowByHxz(param, expenseFlow);
@@ -99,14 +95,12 @@ public class HxzService extends SuperService {
         if (resultContent.isFailed()) {
             resultModel.setFailed(resultContent.getMsg());
             requestInfoService.addRequestInfo(param, resultModel);
-            result.setModel(resultModel);
-            return ResultContent.buildSuccess(JSONUtil.toJsonStr(result));
+            return ResultContent.buildSuccess(JSONUtil.toJsonStr(resultModel));
         }
         // 构建返回结果
         resultModel = expenseFlowService.buildPayResult(expenseFlow.getOrderNo());
-        result.setModel(resultModel);
         requestInfoService.addRequestInfo(param, resultModel);
-        return ResultContent.buildSuccess(JSONUtil.toJsonStr(result));
+        return ResultContent.buildSuccess(JSONUtil.toJsonStr(resultModel));
     }
 
     /**

FullCardServer/src/main/java/com/zhongshu/card/server/core/test/Test.java

@@ -6,7 +6,10 @@ import com.zhongshu.card.client.utils.type.DataState;
 import com.zhongshu.card.server.core.util.CommonUtil;
 import com.zhongshu.card.server.core.util.ValidateResult;
 import com.zhongshu.card.server.core.util.ValidateUtils;
+import groovy.lang.GroovyShell;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -28,8 +31,17 @@ public class Test {
         Map<String, Object> map = new HashMap<>();
         map.put("orderNo", orderNo);
         map.put("age", 24);
+        map.put("money", BigDecimal.valueOf(563.21));
         System.out.println("map = " + JSONUtil.toJsonStr(map));
 
-        System.out.println("em: " + CommonUtil.getEnumByName(DataState.class, "Enable"));
+        BigDecimal b1 = BigDecimal.valueOf(564.32);
+        BigDecimal b2 = BigDecimal.valueOf(54.32);
+        System.out.println("m= " + b1.divide(b2, 5, RoundingMode.HALF_UP));
+
+        GroovyShell groovyShell = new GroovyShell();
+        String res = " println 'Hello, Groovy!' ";
+        Object result1 = groovyShell.evaluate(res);
+        System.out.println("result1 = " + result1);
+
     }
 }