xc-mall.git - Gitblit

parent: a8a697f2 | patch | commit | ignore whitespace

Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz

xiaoyong931011

2022-05-28 e9bcfdba00460e64307f422bd08303a07b90a288

Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz

11 files modified

	src/main/java/cc/mrbird/febs/common/runner/FebsStartedUpRunner.java	2 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java	3 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/cc/mrbird/febs/pay/service/impl/PayServiceImpl.java	2 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/templates/error/403.html	2 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/templates/error/404.html	2 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/templates/error/500.html	2 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/templates/febs/views/layout.html	2 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/templates/febs/views/login.html	4 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html	3 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html	4 ●●●●● patch \| view \| raw \| blame \| history
	src/main/resources/templates/index.html	2 ●●●●● patch \| view \| raw \| blame \| history

 src/main/java/cc/mrbird/febs/common/runner/FebsStartedUpRunner.java

@@ -63,7 +63,7 @@
            log.info("/ /`  / / \\ | |\\/| | |_) | |   | |_   | |  | |_  ");
            log.info("\\_\\_, \\_\\_/ |_|  | |_|   |_|__ |_|__  |_|  |_|__ ");
            log.info("                                                      ");
            log.info("澳芝美 权限系统启动完毕，地址：{}", url);
            log.info("全民商城 权限系统启动完毕，地址：{}", url);

            boolean auto = febsProperties.isAutoOpenBrowser();
            if (auto && StringUtils.equalsIgnoreCase(active, FebsConstant.DEVELOP)) {

 src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java

@@ -118,6 +118,9 @@
        for (MallOrderItem item : items) {
            // 减去成本后算收益
            BigDecimal amount = item.getPrice().subtract(item.getCostPrice()).multiply(BigDecimal.valueOf(item.getCnt()));
            if (amount.compareTo(BigDecimal.ZERO) < 1) {
                continue;
            }

            // =======直推返利== start =====
            // 直接奖励收益

 src/main/java/cc/mrbird/febs/pay/service/impl/PayServiceImpl.java

@@ -54,7 +54,7 @@
    @Override
    public String aliPay(MallOrderInfo orderInfo) {
        AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
        model.setSubject("澳芝美商品支付");
        model.setSubject("全民商城商品支付");
        model.setBody(orderInfo.getName());
        model.setOutTradeNo(orderInfo.getOrderNo());
        model.setTimeoutExpress("15m");

 src/main/resources/templates/error/403.html

@@ -2,7 +2,7 @@
<html xmlns:th="http://www.thymeleaf.org">
<head>
    <meta charset="utf-8">
    <title>澳芝美 权限系统</title>
    <title>全民商城 权限系统</title>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">

 src/main/resources/templates/error/404.html

@@ -2,7 +2,7 @@
<html xmlns:th="http://www.thymeleaf.org">
<head>
    <meta charset="utf-8">
    <title>澳芝美 权限系统</title>
    <title>全民商城 权限系统</title>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">

 src/main/resources/templates/error/500.html

@@ -2,7 +2,7 @@
<html xmlns:th="http://www.thymeleaf.org">
<head>
    <meta charset="utf-8">
    <title>澳芝美 权限系统</title>
    <title>全民商城 权限系统</title>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">

 src/main/resources/templates/febs/views/layout.html

@@ -64,7 +64,7 @@
        <div class="layui-side-scroll">
            <div class="layui-logo" style="cursor: pointer">
                <img data-th-src="@{febs/images/logo.png}">
                <span>澳芝美 权限系统</span>
                <span>全民商城 权限系统</span>
            </div>
            <script
                    type="text/html"

 src/main/resources/templates/febs/views/login.html

@@ -2,7 +2,7 @@
<html xmlns:th="http://www.thymeleaf.org">
<head>
    <meta charset="utf-8">
    <title>澳芝美 权限系统</title>
    <title>全民商城 权限系统</title>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@@ -19,7 +19,7 @@
        <div class="layui-container">
            <div class="layui-row">
                <div class="layui-col-xs12 layui-col-lg4 layui-col-lg-offset4 febs-tc">
                    <div class="layui-logo"><span><b>澳芝美</b> 权限系统</span></div>
                    <div class="layui-logo"><span><b>全民商城</b> 权限系统</span></div>
                </div>
                <div class="layui-col-xs12 layui-col-lg4 layui-col-lg-offset4" id="login-div">
                    <div class="layui-form" lay-filter="login-form">

 src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html

@@ -294,6 +294,9 @@
                value : 'id',
                children : 'child'
            },
            iconfont: {
                parent: 'hidden',
            },
            radio: true,
            clickClose: true,
            tree: {

 src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html

@@ -322,6 +322,9 @@
                value : 'id',
                children : 'child'
            },
            iconfont: {
                parent: 'hidden',
            },
            radio: true,
            clickClose: true,
            tree: {
@@ -552,7 +555,6 @@
                "thumbs": thumbs
            });

            console.log(goodsInfo.categoryId);
            var arr = [];
            arr.push(goodsInfo.categoryId)
            category.setValue(arr);

 src/main/resources/templates/index.html

@@ -3,7 +3,7 @@
      xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
    <meta charset="utf-8">
    <title>澳芝美 权限系统</title>
    <title>全民商城 权限系统</title>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">

			@@ -63,7 +63,7 @@
			log.info("/ /` / / \\ \| \|\\/\| \| \|_) \| \| \| \|_ \| \| \| \|_ ");
			log.info("\\_\\_, \\_\\_/ \|_\| \| \|_\| \|_\|__ \|_\|__ \|_\| \|_\|__ ");
			log.info(" ");
			log.info("澳芝美权限系统启动完毕，地址：{}", url);
			log.info("全民商城权限系统启动完毕，地址：{}", url);

			boolean auto = febsProperties.isAutoOpenBrowser();
			if (auto && StringUtils.equalsIgnoreCase(active, FebsConstant.DEVELOP)) {

			@@ -118,6 +118,9 @@
			for (MallOrderItem item : items) {
			// 减去成本后算收益
			BigDecimal amount = item.getPrice().subtract(item.getCostPrice()).multiply(BigDecimal.valueOf(item.getCnt()));
			if (amount.compareTo(BigDecimal.ZERO) < 1) {
			continue;
			}

			// =======直推返利== start =====
			// 直接奖励收益

			@@ -54,7 +54,7 @@
			@Override
			public String aliPay(MallOrderInfo orderInfo) {
			AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
			model.setSubject("澳芝美商品支付");
			model.setSubject("全民商城商品支付");
			model.setBody(orderInfo.getName());
			model.setOutTradeNo(orderInfo.getOrderNo());
			model.setTimeoutExpress("15m");

			@@ -2,7 +2,7 @@
			<html xmlns:th="http://www.thymeleaf.org">
			<head>
			<meta charset="utf-8">
			<title>澳芝美权限系统</title>
			<title>全民商城权限系统</title>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">

			@@ -64,7 +64,7 @@
			<div class="layui-side-scroll">
			<div class="layui-logo" style="cursor: pointer">
			<img data-th-src="@{febs/images/logo.png}">
			<span>澳芝美权限系统</span>
			<span>全民商城权限系统</span>
			</div>
			<script
			type="text/html"

			@@ -294,6 +294,9 @@
			value : 'id',
			children : 'child'
			},
			iconfont: {
			parent: 'hidden',
			},
			radio: true,
			clickClose: true,
			tree: {

			@@ -322,6 +322,9 @@
			value : 'id',
			children : 'child'
			},
			iconfont: {
			parent: 'hidden',
			},
			radio: true,
			clickClose: true,
			tree: {
			@@ -552,7 +555,6 @@
			"thumbs": thumbs
			});

			console.log(goodsInfo.categoryId);
			var arr = [];
			arr.push(goodsInfo.categoryId)
			category.setValue(arr);

			@@ -3,7 +3,7 @@
			xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
			<head>
			<meta charset="utf-8">
			<title>澳芝美权限系统</title>
			<title>全民商城权限系统</title>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">