Просмотр исходного кода

fix: 消费服务
1.兼容新消费APP,增加V2消费获取AppLogo接口

luoyb 1 год назад
Родитель
Сommit
3321203b6b

+ 1 - 1
ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/business/BaseBusiness.java

@@ -314,7 +314,7 @@ public class BaseBusiness {
 
             // 设置消费信息
             consumeDetailBo.setConsumeDate(bo.getConsumeDate());
-            consumeDetailBo.setConsumeMoney(bo.getConsumeMoney());
+            consumeDetailBo.setConsumeMoney(bagVo.getReceiptMoney());
             consumeDetailBo.setConsumeBalance(bo.getBalance());
             consumeDetailBo.setCardValue(bo.getBalance());
             // 设置卡片信息

+ 13 - 1
ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/business/TermBusiness.java

@@ -77,7 +77,7 @@ public class TermBusiness {
                 LocalDateTime now = LocalDateTime.now();
                 LocalDateTime expireTime = now.plusHours(2);
                 termToken = new TermToken(strTermNo, UUID.randomUUID().toString(), admin, new Date().getTime(), minDate.getTime(),
-                                          Date.from(expireTime.toInstant(ZoneOffset.of("+8"))).getTime());
+                    Date.from(expireTime.toInstant(ZoneOffset.of("+8"))).getTime());
 
                 tokenManager.getTermToken().put(strTermNo, termToken);
             } else {
@@ -117,6 +117,18 @@ public class TermBusiness {
         return R.ok(termInfo);
     }
 
+    public R<Map<String, Object>> getAppLogo(String appType) {
+        Map<String, Object> resultMap = new HashMap<>();
+
+        resultMap.put("currentTime", DateUtil.date().getTime());
+        resultMap.put("success", true);
+        resultMap.put("data", null);
+        resultMap.put("code", "1");
+        resultMap.put("message", "获取成功!");
+
+        return R.ok(resultMap);
+    }
+
     public R<Map<String, Object>> checkTermTime(Integer termNo) {
         XfTermVo termVo = termService.queryVoOneByNo(Long.valueOf(termNo));
         if (ObjectUtil.isEmpty(termVo)) {

+ 30 - 0
ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/controller/v2/TermsControllerV2.java

@@ -0,0 +1,30 @@
+package org.dromara.server.consume.controller.v2;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.server.consume.business.TermBusiness;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping(path = { "/v2/Terms" })
+public class TermsControllerV2 {
+
+	private final TermBusiness termBusiness;
+
+    /**
+     *  根据APP类型获取APP Logo
+     * @param appType APP类型
+     * @return Logo
+     */
+	@GetMapping("/getAppLogo/{appType}")
+	public Object getAppLogo(@PathVariable("appType") String appType) {
+        R<Map<String, Object>> mapResult = termBusiness.getAppLogo(appType);
+		return mapResult.getData();
+	}
+}