记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 987f84a3 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

Merge branch 'hjc_goblin_version2' into pre

parents e1000a58 8e61dc64
Hide whitespace changes
Inline Side-by-side
Showing with 91 additions and 32 deletions
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/manage/IGoblinStoreMoneyService.java
View file @ 987f84a3
......@@ -13,7 +13,7 @@ import java.util.HashMap;
public interface IGoblinStoreMoneyService {
ResponseDto<HashMap<String,String>> money(String spuId);
ResponseDto<HashMap<String,String>> money(String spuId,String st,String et);
ResponseDto<PageInfo<GoblinOrderLogVo>> getSpuList(String spuName, String st, String et, int page);
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinSelfCategoryAdminController.java
View file @ 987f84a3
......@@ -76,6 +76,7 @@ public class GoblinSelfCategoryAdminController extends BaseController {
return AjaxResult.warn("无效参数");
}
queryWrapper.eq(GoblinSelfGoodsCategory::getGrade, grade);
queryWrapper.eq(GoblinSelfGoodsCategory::getDelFlg, "0");
queryWrapper.select(GoblinSelfGoodsCategory::getCateId, GoblinSelfGoodsCategory::getName, GoblinSelfGoodsCategory::getIcon, GoblinSelfGoodsCategory::getNeIsbn);
queryWrapper.orderByAsc(GoblinSelfGoodsCategory::getCateId);
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/manage/GoblinStoreMgtGoodsController.java
View file @ 987f84a3
......@@ -280,7 +280,7 @@ public class GoblinStoreMgtGoodsController {
{// 标签处理
List<String> goodsTagIdList = storeMgtGoodsAddParam.getTagList(),
goodsExtagIdList = storeMgtGoodsAddParam.getExtagList(),
goodsArtagIdList = storeMgtGoodsAddParam.getExtagList();
goodsArtagIdList = storeMgtGoodsAddParam.getArtagList();
if (!CollectionUtils.isEmpty(goodsTagIdList)) {
List<GoblinSelfTagVo> selfGoodsTagVos = goblinRedisUtils.getSelfTagVos();
List<GoblinGoodsTagVo> goodsTagVoList = ObjectUtil.getGoblinGoodsTagVoArrayList();
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/manage/GoblinStoreMoneyController.java
View file @ 987f84a3
......@@ -32,10 +32,14 @@ public class GoblinStoreMoneyController {
@ApiOperation("商品资金总收入")
@ApiImplicitParams({
@ApiImplicitParam(type = "form", required = false, dataType = "String", name = "spuId", value = "spuId"),
@ApiImplicitParam(type = "form", required = false, dataType = "String", name = "st", value = "开始时间"),
@ApiImplicitParam(type = "form", required = false, dataType = "String", name = "et", value = "截至时间"),
})
@ApiResponse(code = 200, message = "接口返回对象参数")
public ResponseDto<HashMap<String,String>> money(@RequestParam(value = "spuId", required = false) String spuId) {
return goblinStoreMoneyService.money(spuId);
public ResponseDto<HashMap<String, String>> money(@RequestParam(value = "spuId", required = false) String spuId,
@RequestParam(value = "st", required = false) String st,
@RequestParam(value = "et", required = false) String et) {
return goblinStoreMoneyService.money(spuId, st, et);
}
@GetMapping("spu/list")
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreMoneyServiceImpl.java
View file @ 987f84a3
......@@ -25,13 +25,13 @@ public class GoblinStoreMoneyServiceImpl implements IGoblinStoreMoneyService {
GoblinMongoUtils mongoUtils;
@Override
public ResponseDto<HashMap<String,String>> money(String spuId) {
public ResponseDto<HashMap<String,String>> money(String spuId,String st,String et) {
String uid = CurrentUtil.getCurrentUid();
GoblinStoreInfoVo vo = redisUtils.getStoreInfoVoByUid(uid);
if (vo == null) {
return ResponseDto.failure("店铺不存在");
}
String data = mongoUtils.storeMoney(vo.getStoreId(), spuId);
String data = mongoUtils.storeMoney(vo.getStoreId(), spuId,st,et);
String[] array = data.split(",");
HashMap<String,String> map = CollectionUtil.mapStringString();
map.put("name",array[0]);
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinMongoUtils.java
View file @ 987f84a3
......@@ -43,6 +43,8 @@ import java.util.List;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
@Component
public class GoblinMongoUtils {
@Autowired
......@@ -445,6 +447,7 @@ public class GoblinMongoUtils {
return mongoTemplate.findOne(Query.query(Criteria.where("storeId").is(storeId).and("name").is(name).and("delFlg").is("0")),
GoblinGoodsInfoVo.class, GoblinGoodsInfoVo.class.getSimpleName());
}
public long countMgtGoodsInfoVo(String name) {
return mongoTemplate.count(Query.query(Criteria.where("name").is(name).and("delFlg").is("0")),
GoblinGoodsInfoVo.class.getSimpleName());
......@@ -806,9 +809,14 @@ public class GoblinMongoUtils {
}
//店铺总收入
public String storeMoney(String storeId, String spuId) {
public String storeMoney(String storeId, String spuId, String st, String et) {
String spuName = "店铺总收入";
Criteria criteria = Criteria.where("status").in(GoblinStatusConst.Status.ORDER_LOG_STATUS_11.getValue(), GoblinStatusConst.Status.ORDER_LOG_STATUS_22.getValue(), GoblinStatusConst.Status.ORDER_LOG_STATUS_28.getValue()).and("storeId").is(storeId);
if (st != null && et != null) {
LocalDateTime stDateTime = LocalDateTime.parse(st, DTF_YMD_HMS);
LocalDateTime etDateTime = LocalDateTime.parse(et, DTF_YMD_HMS);
criteria = criteria.and("createdAt").gte(stDateTime).lt(etDateTime);
}
Aggregation aggregation;
if (spuId != null) {
criteria = criteria.and("spuId").is(spuId);
......@@ -857,7 +865,9 @@ public class GoblinMongoUtils {
List<GoblinGoodsInfoVo> spuIdAndName = null;
Criteria criteria = Criteria.where("status").in(GoblinStatusConst.Status.ORDER_LOG_STATUS_11.getValue(), GoblinStatusConst.Status.ORDER_LOG_STATUS_22.getValue(), GoblinStatusConst.Status.ORDER_LOG_STATUS_28.getValue()).and("storeId").is(storeId);
if (st != null && et != null) {
criteria = criteria.and("createdAt").gte(st).lt(et);
LocalDateTime stDateTime = LocalDateTime.parse(st, DTF_YMD_HMS);
LocalDateTime etDateTime = LocalDateTime.parse(et, DTF_YMD_HMS);
criteria = criteria.and("createdAt").gte(stDateTime).lt(etDateTime);
}
//查询总数量
Query countQuery = Query.query(criteria);
......@@ -870,7 +880,7 @@ public class GoblinMongoUtils {
}
if (spuName != null) {
//根据spu名称查询spuId
Query query = Query.query(Criteria.where("name").regex(".*?" + spuName + ".*").and("storeId").is(storeId));
Query query = Query.query(Criteria.where("name").regex(".*?" + spuName + ".*").and("storeId").is(storeId)).with(Sort.by(Sort.Order.desc("createdAt")));
query.fields().include("spuId").include("name");
spuIdAndName = mongoTemplate.find(query, GoblinGoodsInfoVo.class, GoblinGoodsInfoVo.class.getSimpleName());
spuIdList = spuIdAndName.stream().map(GoblinGoodsInfoVo::getSpuId).collect(Collectors.toList());
......@@ -878,7 +888,7 @@ public class GoblinMongoUtils {
finalCount = spuIdList.size();
}
}
if(finalCount>0){
if (finalCount > 0) {
spuIdList = spuIdList.subList(skipCount, finalCount);
}
criteria = criteria.and("spuId").in(spuIdList);
......@@ -920,7 +930,9 @@ public class GoblinMongoUtils {
int skipCount = ((page - 1) * size);
Criteria criteria = Criteria.where("spuId").is(spuId);
if (st != null && et != null) {
criteria = criteria.and("createdAt").gte(st).lt(et);
LocalDateTime stDateTime = LocalDateTime.parse(st, DTF_YMD_HMS);
LocalDateTime etDateTime = LocalDateTime.parse(et, DTF_YMD_HMS);
criteria = criteria.and("createdAt").gte(stDateTime).lt(etDateTime);
}
if (orderCode != null) {
criteria = criteria.and("orderCode").is(orderCode);
......@@ -940,7 +952,7 @@ public class GoblinMongoUtils {
criteria = criteria.and("orderType").is("zhengzai").and("status").in(22, 28);
break;
}
}else{
} else {
criteria = criteria.and("status").in(
GoblinStatusConst.Status.ORDER_LOG_STATUS_11.getValue(),
GoblinStatusConst.Status.ORDER_LOG_STATUS_22.getValue(),
......@@ -1192,7 +1204,7 @@ public class GoblinMongoUtils {
//根据艺人标签和演出查询商品
public List<GoblinGoodsInfoVo> getMusicTagPGoods(String musicTag, String performanceId) {
Query query = Query.query(Criteria.where("extagVoList.tagName").is(musicTag)
Query query = Query.query(Criteria.where("artagVoList.tagName").is(musicTag)
.and("delFlg").is("0").and("shelvesStatus").is("3"));
return mongoTemplate.find(query,
GoblinGoodsInfoVo.class,
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinRedisUtils.java
View file @ 987f84a3
......@@ -1216,9 +1216,9 @@ public class GoblinRedisUtils {
// String rk = GoblinRedisConst.REDIS_ZZ_MUSIC_TAG.concat(musicTag + ":").concat(performanceId);
// Object obj = redisUtil.get(rk);
// if (obj == null) {
listVo = goblinMongoUtils.getMusicTagPGoods(musicTag, performanceId);
// redisUtil.set(rk, listVo);
return listVo;
listVo = goblinMongoUtils.getMusicTagPGoods(musicTag, performanceId);
// redisUtil.set(rk, listVo, 60 * 30);
return listVo;
// } else {
// return (List<GoblinGoodsInfoVo>) obj;
// }
......
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinOrderServiceImpl.java
View file @ 987f84a3
......@@ -385,7 +385,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
orderAttr.setOrderId(orderId);
if (!writeOffCode.equals("EMPTY")) {
orderAttr.setExpressContacts(addressesVo.getName());
orderAttr.setExpressAddress(addressesVo.getProvince() + "," + addressesVo.getCounty() + "," + addressesVo.getCity());
orderAttr.setExpressAddress(addressesVo.getProvince() + " " + addressesVo.getCity() + " " + addressesVo.getCounty());
orderAttr.setExpressAddressDetail(addressesVo.getAddress());
orderAttr.setExpressPhone(addressesVo.getPhone());
orderAttr.setExpressType(1);
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/kylin/DataController.java
View file @ 987f84a3
......@@ -19,12 +19,12 @@ public class DataController {
private DataImpl data;
@PostMapping("phpGoodsOrder")
@ApiOperation("php今年订单迁移")
public ResponseDto<Boolean> fieldData() {
data.fieldData();
return ResponseDto.success();
}
// @PostMapping("phpGoodsOrder")
// @ApiOperation("php今年订单迁移")
// public ResponseDto<Boolean> fieldData() {
// data.fieldData();
// return ResponseDto.success();
// }
// @PostMapping("fieldData")
// @ApiOperation("场地数据迁移")
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/kylin/DataImpl.java
View file @ 987f84a3
......@@ -9,6 +9,7 @@ import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.feign.stone.api.FeignStoneIntegralClient;
import com.liquidnet.service.goblin.constant.GoblinRedisConst;
import com.liquidnet.service.goblin.constant.GoblinStatusConst;
import com.liquidnet.service.goblin.dto.vo.GoblinMailVo;
import com.liquidnet.service.goblin.dto.vo.GoblinOrderAttrVo;
import com.liquidnet.service.goblin.dto.vo.GoblinOrderSkuVo;
import com.liquidnet.service.goblin.dto.vo.GoblinStoreOrderVo;
......@@ -74,7 +75,7 @@ public class DataImpl {
" m.matter_num as 'master_order_code',\n" +
" m.matter_num as 'order_code',\n" +
" m.out_trade_no as 'pay_code',\n" +
" ifnull(user_id, user_id_new) as 'user_id',\n" +
" m.user_id_new as 'user_id',\n" +
" m.matter_amount as 'price_total',\n" +
" (m.matter_amount - m.coupon_type2_price) as 'price_actual',\n" +
" m.price_send as 'price_express',\n" +
......@@ -93,10 +94,14 @@ public class DataImpl {
" m.post_phone as 'express_phone',\n" +
" m.post_address as 'express_address',\n" +
" m.post_address as 'express_address_detail',\n" +
" m.created_at as 'created_at'\n" +
"from matters as m\n" +
" m.created_at as 'created_at',\n" +
" e.name as 'logistics_company',\n" +
" e.status as 'express_status',\n" +
" e.number as 'mail_no',\n" +
" e.created_at as 'delivery_time'\n" +
"from matters as m left join expresses as e on e.order_id = m.id and e.order_type = 'order_product'\n" +
"where m.status = 1\n" +
" and m.created_at >= '2022-01-01 00:00:00'";
" and m.created_at >= '2022-01-01 00:00:00' group by m.id;";
Connection connection = DriverManager.getConnection(SQL_URL, SQL_USER, SQL_PWD);
//查询数据
PreparedStatement preparedStatement = connection.prepareStatement(sql);
......@@ -107,7 +112,18 @@ public class DataImpl {
orderVo.setStoreId("dab4742921ba3555700896c4fafbee5b");
orderVo.setStoreName("摩登天空自营店");
orderVo.setPayCountdownMinute(5);
orderVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_4.getValue());
//判断快递状态
String express_status = row.getString("express_status");
if (express_status == null) {
orderVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_2.getValue());
} else {
if (express_status.equals("3")) {
orderVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_4.getValue());
} else {
orderVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_3.getValue());
}
}
orderVo.setOrderId(row.getString("order_id"));
orderVo.setMasterOrderCode(row.getString("master_order_code"));
orderVo.setOrderCode(row.getString("order_code"));
......@@ -163,7 +179,7 @@ public class DataImpl {
while (rowSku.next()) {
GoblinOrderSkuVo skuVo = GoblinOrderSkuVo.getNew();
skuVo.setOrderId(orderVo.getOrderId());
skuVo.setStatus(GoblinStatusConst.Status.ORDER_STATUS_4.getValue());
skuVo.setStatus(orderVo.getStatus());
skuVo.setOrderSkuId(rowSku.getString("order_sku_id"));
skuVo.setSpuId(rowSku.getString("spu_id"));
skuVo.setSkuId(rowSku.getString("sku_id"));
......@@ -172,15 +188,27 @@ public class DataImpl {
skuVo.setSkuPriceActual(rowSku.getBigDecimal("sku_price_actual"));
skuVo.setSkuName(rowSku.getString("sku_specs"));
skuVo.setSkuImage(rowSku.getString("sku_image"));
skuVo.setSkuSpecs("[{\"specName\":\""+rowSku.getString("sku_name")+"\",\"specVname\":\""+rowSku.getString("sku_specs")+"\"}]");//
skuVo.setSkuSpecs("[{\"specName\":\"" + rowSku.getString("sku_name") + "\",\"specVname\":\"" + rowSku.getString("sku_specs") + "\"}]");//
skuVo.setSpuName(rowSku.getString("spu_name"));
skuVo.setCreatedAt(orderVo.getCreatedAt());
setGoblinOrderSku(skuVo.getOrderSkuId(), skuVo);
orderSkuIds.add(skuVo.getOrderSkuId());
}
//判断快递
if (express_status != null) {
GoblinMailVo mailVo = GoblinMailVo.getNew();
mailVo.setMailId(IDGenerator.nextTimeId2());
mailVo.setOrderId(orderVo.getOrderId());
mailVo.setMailNo(row.getString("mail_no"));
mailVo.setDeliveryTime(row.getString("delivery_time"));
mailVo.setLogisticsCompany(row.getString("logistics_company"));
mailVo.setOrderSkuVoIds(orderSkuIds);
setGoblinMail(orderVo.getOrderId(), mailVo);
}
orderVo.setOrderSkuVoIds(orderSkuIds);
setGoblinOrder(orderVo.getOrderId(),orderVo);
addOrderList(orderVo.getUserId(),orderVo.getOrderId());
setGoblinOrder(orderVo.getOrderId(), orderVo);
// addOrderList(orderVo.getUserId(), orderVo.getOrderId());
rowSku.close();
preparedStatementSku.close();
......@@ -227,4 +255,18 @@ public class DataImpl {
return (List<String>) obj;
}
}
// 赋值 快递vo
public void setGoblinMail(String orderId, GoblinMailVo vo) {
String redisKey = GoblinRedisConst.REDIS_GOBLIN_MAIL.concat(orderId);
List<GoblinMailVo> list = goblinMailVoList();
list.add(vo);
redisDataSourceUtil.getRedisKylinUtil().set(redisKey, list);
}
private static final ArrayList<GoblinMailVo> goblinMailVo = new ArrayList<>();
public static ArrayList<GoblinMailVo> goblinMailVoList() {
return (ArrayList<GoblinMailVo>) goblinMailVo.clone();
}
}
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