Skip to content

F
farming
Commit 674df5c6 by 郑云飞
Options

1.开团时间明明是10点半但是在这之前居然也可下单付款修改 

2.开团放多个地址选项 已知2个
3.用户信息没有随机头像和名称
4.显示售出多少份
parent 49970133
Showing with 110 additions and 50 deletions
src/main/java/com/yunniu/farming/util/FileUtil.java
......@@ -10,9 +10,9 @@ public class FileUtil {
public static final String Base = "D:/service";
//public static final String BasePath = "D://upload";
public static final String BasePath = "C://data//upload";
public static final String BasePath = "/usr/upload";
// public static final String BasePath = "/usr/upload";
//public static final String BasePath = "/upload";
public static final String Path = "/upload";
......
src/main/java/com/yunniu/farming/webadmin/model/GroupBuyProduct.java
......@@ -42,6 +42,9 @@ public class GroupBuyProduct {
private String updateBy;
@TableField(exist = false)
private Integer ipronum;
/**
* 辅助对象:分页信息对象
*/
......
src/main/java/com/yunniu/farming/webadmin/service/impl/GroupBuyServiceimpl.java
......@@ -92,7 +92,8 @@ public class GroupBuyServiceimpl implements GroupBuyService {
groupBuy.setEndDate(formatter.format(groupBuy.getEndTime()));
// 团购商品
List<Product> productList = groupBuyProductDao.getProductList(id);
List<GroupBuyProduct> products = groupBuyProductDao.selectList(Wrappers.<GroupBuyProduct>lambdaQuery().eq(GroupBuyProduct::getGroupBuyId, id));
List<GroupBuyProduct> products = groupBuyProductDao.getList(id);
// List<GroupBuyProduct> products = groupBuyProductDao.selectList(Wrappers.<GroupBuyProduct>lambdaQuery().eq(GroupBuyProduct::getGroupBuyId, id));
groupBuy.setProductList(JSON.toJSONString(productList));
groupBuy.setProducts(products);
// 团购小区
......
src/main/java/com/yunniu/farming/webadmin/service/impl/WxServiceImpl.java
......@@ -3,9 +3,13 @@ package com.yunniu.farming.webadmin.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.yunniu.farming.util.*;
import com.yunniu.farming.webadmin.dao.*;
import com.yunniu.farming.webadmin.model.*;
import com.yunniu.farming.webadmin.service.GroupOrderService;
import com.yunniu.farming.webadmin.dao.CustomerDao;
import com.yunniu.farming.webadmin.dao.IntegralrecDao;
import com.yunniu.farming.webadmin.dao.OrderMainDao;
import com.yunniu.farming.webadmin.model.Customer;
import com.yunniu.farming.webadmin.model.Integralrec;
import com.yunniu.farming.webadmin.model.OrderMain;
import com.yunniu.farming.webadmin.model.Result;
import com.yunniu.farming.webadmin.service.WxService;
import com.yunniu.farming.wx.WxConfigUtil;
import com.yunniu.farming.wx.WxUtil;
......@@ -44,7 +48,10 @@ public class WxServiceImpl implements WxService {
@Autowired
private GroupOrderServiceImpl groupOrderService;
private String[] imageUrl = {"https://yuezhi-1314984551.cos.ap-shanghai.myqcloud.com/register/41e98a7cc2834450b41927219197d713.jpeg"
, "https://yuezhi-1314984551.cos.ap-shanghai.myqcloud.com/register/65daa7ab2a9c46c99a580874c73465e3.jpeg"
, "https://yuezhi-1314984551.cos.ap-shanghai.myqcloud.com/register/056bb47d0b274ab7b430ddd522b18ee3.jpeg"
, "https://yuezhi-1314984551.cos.ap-shanghai.myqcloud.com/register/d8cee72db9e84166937e26e5871d9324.jpeg"};
// @Autowired
// private RedisUtil redisUtil;
......@@ -54,7 +61,7 @@ public class WxServiceImpl implements WxService {
public Result login(String code) {
if(StringHelper.isEmpty(code) ||
if (StringHelper.isEmpty(code) ||
code.equals("the code is a mock one")) {
return new Result(103,"Error::获取小程序Js_code失败！");
......@@ -88,6 +95,12 @@ public class WxServiceImpl implements WxService {
// u.setUnionId(unionId);
u.setIroleid(Customer.ROLE_NORMAL);//普通用户
u.setTcreatetime(new Date());
int index = (int) (Math.random() * imageUrl.length);
u.setSwximgurl(imageUrl[index]);
Random random = new Random();
int number = random.nextInt(10000); // 生成[0,10000)之间的随机整数
String result = String.format("%04d", number);
u.setSwxnick("小菜果" + result);
int insert = this.customerDao.insert(u);
if (insert > 0) {
......
src/main/resources/application.properties
#spring.datasource.url=jdbc:mysql://152.136.113.101:3306/farming?autoReconnect=true&useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
#spring.datasource.username=root
#spring.datasource.password=Root_123456
spring.datasource.url=jdbc:mysql://localhost:3306/farming?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username=farming
spring.datasource.password=PKWB6psxa7FBApZB
#spring.datasource.url=jdbc:mysql://db1.prd.jianghuxx.com:3317/farming?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
#spring.datasource.username=root
#spring.datasource.password=4f9fa23639242790
#spring.datasource.url=jdbc:mysql://localhost:3306/farming?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
#spring.datasource.username=farming
#spring.datasource.password=PKWB6psxa7FBApZB
spring.datasource.url=jdbc:mysql://db1.prd.jianghuxx.com:3317/farming?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
spring.datasource.username=root
spring.datasource.password=4f9fa23639242790
#7LwimZ27FqEnzIPg
##47.101.199.10
spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
......
src/main/resources/mappings/GroupBuyProductMapper.xml
......@@ -19,14 +19,36 @@
p.sname,
p.sduction,
p.sunit,
p.doldprice,
p.dsaleprice,
dc.sname as catalogName
p.doldprice,
p.dsaleprice,
dc.sname as catalogName
from group_buy_product gbp
left join product p on gbp.product_id = p.id
left join doc_catalog dc on p.catalogid = dc.id
left join product p on gbp.product_id = p.id
left join doc_catalog dc on p.catalogid = dc.id
where gbp.group_buy_id = #{id,jdbcType=BIGINT}
and gbp.status = 0
and gbp.status = 0
</select>
<select id="getList" resultType="com.yunniu.farming.webadmin.model.GroupBuyProduct">
SELECT
gbp.*,
ms.ipronum
FROM
group_buy_product gbp
LEFT JOIN (
SELECT
om.id,
om.group_order_id,
os.productid,
SUM( os.ipronum ) AS ipronum
FROM
order_main om
LEFT JOIN order_sub os ON om.id = os.mainid
WHERE
om.group_order_id IS NOT NULL
GROUP BY
os.productid
) ms ON gbp.product_id = ms.productid
where gbp.group_buy_id = #{id,jdbcType=BIGINT}
</select>
</mapper>
\ No newline at end of file
src/main/resources/templates/groupBuy/addOrEdit.html
......@@ -11,6 +11,7 @@
<link rel="stylesheet" th:href="@{/js/upload_img/css/index.css}">
<script type="text/javascript" th:src="@{/js/jquery-3.3.1.min.js}"></script>
<script type="text/javascript" th:src="@{/js/xm-select.js}"></script>
<script th:src="@{/js/layui/layui.js}" charset="utf-8"></script>
<script type="text/javascript" th:src="@{/js/layui/layui.all.js}" charset="utf-8"></script>
<link rel="stylesheet" th:href="@{/js/ueditor/themes/default/css/ueditor.css}" type="text/css"/>
......@@ -63,11 +64,10 @@
</div>
<div class="layui-form-item">
<label class="layui-form-label"><span style="color: red">*</span>配送小区</label>
<div class="layui-input-inline">
<select name="areaIdList" id="areaIdList" multiple>
<option th:each="list:${areaList}" th:value="${list.id}"
th:text="${list.areaName }"></option>
</select>
<div class="layui-input-inline" id="areaIdList">
<!-- <select name="areaIdList" id="areaIdList" xm-select="multiSelect" xm-select-skin="primary" lay-omit>-->
<!-- &lt;!&ndash; 选项列表 &ndash;&gt;-->
<!-- </select>-->
</div>
<label class="layui-form-label">简介</label>
<div class="layui-input-inline">
......@@ -139,6 +139,7 @@
<script>
var id = '[[${id}]]';
var areaList = '[[${areaList}]]';
var ue = UE.getEditor('editor');
UE.Editor.prototype._bkGetActionUrl = UE.Editor.prototype.getActionUrl;
......@@ -153,18 +154,7 @@
}
}
// 设置默认选中项
var selectedValues = [];
if (id) {
selectedValues = JSON.parse('[[${obj.areaIdList}]]');
// 获取下拉框元素
var select = document.getElementById('areaIdList');
// 遍历下拉框选项，设置选中状态
for (var i = 0; i < select.options.length; i++) {
if (selectedValues.includes(parseInt(select.options[i].value))) {
select.options[i].selected = true;
}
}
}
var selectedValues;
layui.use(['laydate'], function() {
var laydate = layui.laydate;
......@@ -177,17 +167,47 @@
type: 'datetime' // 设置日期时间类型，带时分秒
});
});
layui.use('form', function () {
layui.use(['form', 'jquery', 'xmSelect'], function () {
var form = layui.form;
form.render();
// 监听 select 元素的 change 事件
form.on('select(areaIdList)', function (data) {
if (selectedValues.includes(parseInt(data.value))) {
var index = selectedValues.indexOf(parseInt(data.value));
selectedValues.splice(index, 1);
} else {
selectedValues.push(parseInt(data.value));
var $ = layui.jquery;
var xmSelect = layui.xmSelect;
var item = {
curpage: 1,
pagesize: 99999
};
$.ajax({
url: '/groupArea/findPageList', // 替换成你的接口地址
type: 'post',
dataType: 'json',
data: JSON.stringify(item),
processData: false,
contentType: "application/json",
success: function (res) {
// 渲染下拉选项
let arr = new Array(), brr = new Array();
if (res.data.items && res.data.items.length) {
res.data.items.forEach(item => {
arr.push({
name: item.areaName,
value: item.id
})
})
if ('[[${obj.areaIdList}]]') {
brr = JSON.parse('[[${obj.areaIdList}]]');
}
}
selectedValues = xmSelect.render({
el: '#areaIdList', // 下拉框容器的 id
data: arr, // 接口返回的数据，格式为 [{name: '选项1', value: 'value1'}, {name: '选项2', value: 'value2'}, ...]
layVerify: 'required', // 表单验证规则，可根据需要自定义
initValue: brr, // 设置初始值，格式为 ['value1', 'value2', ...]
});
// 渲染完成后，调用 layui 的 form.render() 方法更新渲染
form.render();
},
error: function (err) {
console.error('接口请求失败：', err);
}
});
});
......@@ -350,7 +370,7 @@
var startTime = $("#formId input[name='startDate']").val();
var endTime = $("#formId input[name='endDate']").val();
if (!$("#areaIdList").val()) {
if (selectedValues.getValue("value").length <= 0) {
layer.msg("配送小区不能为空!");
return false;
}
......@@ -367,7 +387,7 @@
}
var form = document.querySelector("#formId");
var formdata = new FormData(form);
var areaIdList = $("#areaIdList").val();
var areaIdList = selectedValues.getValue("value");
var products = [];
// 遍历原数组
for (var i = 0; i < selectedData.length; i++) {
......
src/main/resources/templates/groupBuy/list.html
......@@ -185,6 +185,7 @@
str += '<div>';
//订单状态
var status = "";
if (d.groupStatus == 2) status = "<span class='layui-badge layui-bg-green'>待生效</span>";
if (d.groupStatus == 3) status = "<span class='layui-badge layui-bg-orange'>生效中</span>";
if (d.groupStatus == 4) status = "<span class='layui-badge layui-bg-black'>已失效</span>";
str += ' <span>' + status + '</span>';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment