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

Merge branch 'release_toaliyun_real_20230701' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_20230701

release_toaliyun_real
lin 2 лет назад
Родитель
Сommit
a6ff74ea40
8 измененных файлов: 32 добавлений и 10 удалений
  1. +1
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java
  2. +1
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java
  3. +9
    -0
      mallinkAdmin/src/main/resources/db/migration/V2023070600001_circle_permission.sql
  4. +9
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumCarCmd.java
  5. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java
  6. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java
  7. +3
    -2
      mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml
  8. +3
    -2
      mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml

+ 1
- 3
mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java Просмотреть файл

@@ -122,9 +122,7 @@ public class AliBusinessCircleOrderController extends BaseController {
if (null == circleOrder) { if (null == circleOrder) {
circleOrder = new AliBusinessCircleOrder(); circleOrder = new AliBusinessCircleOrder();
} }
// circleOrder.updateTenantInfo(getTenantInfo());
circleOrder.setTenantId("789");
circleOrder.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC);
circleOrder.updateTenantInfo(getTenantInfo());
final PageInfo<AlipayOrWxStatistics> page = aliBusinessCircleOrderService.aliPayList(circleOrder, pageNum, pageSize); final PageInfo<AlipayOrWxStatistics> page = aliBusinessCircleOrderService.aliPayList(circleOrder, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }


+ 1
- 3
mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java Просмотреть файл

@@ -118,9 +118,7 @@ public class WxBusinessCircleOrderController extends BaseController {
if (null == circleOrder) { if (null == circleOrder) {
circleOrder = new WxBusinessCircleOrder(); circleOrder = new WxBusinessCircleOrder();
} }
// circleOrder.updateTenantInfo(getTenantInfo());
circleOrder.setTenantId("789");
circleOrder.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC);
circleOrder.updateTenantInfo(getTenantInfo());
final PageInfo<AlipayOrWxStatistics> page = wxBusinessCircleOrderService.wxPayList(circleOrder, pageNum, pageSize); final PageInfo<AlipayOrWxStatistics> page = wxBusinessCircleOrderService.wxPayList(circleOrder, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }


+ 9
- 0
mallinkAdmin/src/main/resources/db/migration/V2023070600001_circle_permission.sql Просмотреть файл

@@ -0,0 +1,9 @@
INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (423, '商圈交易统计', 416, 'Y', NULL, 1, NULL, NULL, 'circleSum', NULL, 0, 421);


UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 201, 202, 203, 204, 205, 206, 209, 210, 211, 212, 221, 222, 224, 225, 251, 261, 299, 300, 301, 302, 303, 304, 305, 306, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 423, 431, 432, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 616, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 652, 653, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 713, 714, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 5502, 6610, 6611, 41701, 41702, 60701, 60702, 61201]' WHERE `id` = 1;
UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 4, 5, 6, 7, 8, 9, 10, 50, 101, 102, 103, 104, 105, 106, 107, 201, 202, 203, 204, 205, 209, 210, 211, 212, 221, 222, 224, 225, 251, 261, 409, 410, 411, 416, 418, 420, 421, 423, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 616, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 652, 653, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 713, 714, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 961, 5502, 6610, 6611, 60701, 60702, 61201]' WHERE `id` = 2;
UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 201, 202, 203, 204, 205, 206, 209, 210, 211, 212, 221, 222, 223, 224, 225, 251, 261, 299, 300, 301, 302, 303, 304, 305, 306, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 423, 431, 432, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 615, 616, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 647, 651, 652, 653, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 676, 680, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 713, 714, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 5502, 6610, 6611, 41701, 41702, 60701, 60702, 61201, 61202, 61501, 61502]' WHERE `id` = 12;
UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 201, 202, 203, 204, 205, 206, 209, 210, 211, 212, 221, 222, 224, 225, 251, 261, 299, 300, 301, 302, 303, 304, 305, 306, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 423, 431, 432, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 616, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 652, 653, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 713, 714, 715, 901, 902, 903, 904, 905, 906, 907, 910, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 5502, 6610, 6611, 41701, 41702, 60701, 60702, 61201]' WHERE `id` = 1028;
UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 201, 202, 203, 204, 205, 206, 209, 210, 211, 212, 221, 222, 224, 225, 251, 261, 299, 300, 307, 308, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 423, 431, 432, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 616, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 652, 653, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 713, 714, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 5502, 6610, 6611, 41701, 41702, 60701, 60702, 61201]' WHERE `id` = 1035001036;
UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 201, 202, 203, 204, 205, 206, 209, 210, 211, 212, 221, 222, 225, 223, 224, 251, 261, 299, 300, 307, 308, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 423, 431, 432, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 615, 616, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 647, 651, 652, 653, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 676, 680, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 713, 714, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 5502, 6610, 6611, 41701, 41702, 60701, 60702, 61201, 61202, 61501, 61502]' WHERE `id` = 103500103610;

+ 9
- 0
mallinkService/src/main/java/com/iformall/enums/EnumCarCmd.java Просмотреть файл

@@ -69,6 +69,9 @@ public enum EnumCarCmd {
list.add(CAR_CYF_CALLBACK_PARK_IN.getCode()); list.add(CAR_CYF_CALLBACK_PARK_IN.getCode());
list.add(CAR_JIESHUN_CALLBACK_PARK_IN.getCode()); list.add(CAR_JIESHUN_CALLBACK_PARK_IN.getCode());
list.add(CAR_HAIKANGWEISHI_CALLBACK_PARK_IN.getCode()); list.add(CAR_HAIKANGWEISHI_CALLBACK_PARK_IN.getCode());
list.add(CAR_FUTE_CALLBACK_PARK_IN.getCode());
list.add(CAR_LIFANG_CALLBACK_PARK_IN.getCode());
list.add(CAR_KETUO_CALLBACK_PARK_IN.getCode());
return list; return list;
} }


@@ -80,6 +83,9 @@ public enum EnumCarCmd {
list.add(CAR_CYF_CALLBACK_PARK_OUT.getCode()); list.add(CAR_CYF_CALLBACK_PARK_OUT.getCode());
list.add(CAR_JIESHUN_CALLBACK_PARK_OUT.getCode()); list.add(CAR_JIESHUN_CALLBACK_PARK_OUT.getCode());
list.add(CAR_HAIKANGWEISHI_CALLBACK_PARK_OUT.getCode()); list.add(CAR_HAIKANGWEISHI_CALLBACK_PARK_OUT.getCode());
list.add(CAR_FUTE_CALLBACK_PARK_OUT.getCode());
list.add(CAR_LIFANG_CALLBACK_PARK_OUT.getCode());
list.add(CAR_KETUO_CALLBACK_PARK_OUT.getCode());
return list; return list;
} }


@@ -91,6 +97,9 @@ public enum EnumCarCmd {
list.add(CAR_CYF_CALLBACK_PAID.getCode()); list.add(CAR_CYF_CALLBACK_PAID.getCode());
list.add(CAR_JIESHUN_CALLBACK_PAID.getCode()); list.add(CAR_JIESHUN_CALLBACK_PAID.getCode());
list.add(CAR_HAIKANGWEISHI_CALLBACK_PAID.getCode()); list.add(CAR_HAIKANGWEISHI_CALLBACK_PAID.getCode());
list.add(CAR_FUTE_CALLBACK_PAID.getCode());
list.add(CAR_LIFANG_CALLBACK_PAID.getCode());
list.add(CAR_KETUO_CALLBACK_PAID.getCode());
return list; return list;
} }




+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java Просмотреть файл

@@ -389,6 +389,9 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder
List<Long> ids = wxMerchantService.selectByMerchantIds(record.getMerchantName()); List<Long> ids = wxMerchantService.selectByMerchantIds(record.getMerchantName());
if (!CollectionUtils.isEmpty(ids)) { if (!CollectionUtils.isEmpty(ids)) {
record.setMerchantIds(ids); record.setMerchantIds(ids);
}else{
ids.add(-999l);
record.setMerchantIds(ids);
} }
} }




+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java Просмотреть файл

@@ -564,6 +564,9 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe
List<Long> ids = wxMerchantService.selectByMerchantIds(record.getMerchantName()); List<Long> ids = wxMerchantService.selectByMerchantIds(record.getMerchantName());
if (!CollectionUtils.isEmpty(ids)) { if (!CollectionUtils.isEmpty(ids)) {
record.setMerchantIds(ids); record.setMerchantIds(ids);
}else{
ids.add(-999l);
record.setMerchantIds(ids);
} }
} }




+ 3
- 2
mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml Просмотреть файл

@@ -229,7 +229,7 @@
and is_refund = 1 and is_refund = 1
</select> </select>


<select id="aliPayList" resultType="com.iformall.domain.vo.AlipayOrWxStatistics">
<select id="aliPayList" parameterType="com.iformall.domain.po.AliBusinessCircleOrder" resultType="com.iformall.domain.vo.AlipayOrWxStatistics">
SELECT SUM(pay_amount) as 'payAmount', SELECT SUM(pay_amount) as 'payAmount',
SUM(refund_amount) as 'refundAmount', SUM(refund_amount) as 'refundAmount',
merchant_id as 'merchantId', merchant_id as 'merchantId',
@@ -241,7 +241,8 @@
#{id} #{id}
</foreach> </foreach>
</if> </if>
GROUP BY merchant_id,is_refund;
GROUP BY merchant_id,is_refund
order by payAmount desc;
</select> </select>


</mapper> </mapper>

+ 3
- 2
mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml Просмотреть файл

@@ -261,7 +261,7 @@
and is_refund = 1 and is_refund = 1
</select> </select>


<select id="wxPayList" resultType="com.iformall.domain.vo.AlipayOrWxStatistics">
<select id="wxPayList" parameterType="com.iformall.domain.po.WxBusinessCircleOrder" resultType="com.iformall.domain.vo.AlipayOrWxStatistics">
SELECT SUM(pay_amount) as 'payAmount', SELECT SUM(pay_amount) as 'payAmount',
SUM(refund_amount) as 'refundAmount', SUM(refund_amount) as 'refundAmount',
merchant_id as 'merchantId', merchant_id as 'merchantId',
@@ -273,6 +273,7 @@
#{id} #{id}
</foreach> </foreach>
</if> </if>
GROUP BY merchant_id,is_refund;
GROUP BY merchant_id,is_refund
order by payAmount desc;
</select> </select>
</mapper> </mapper>

Загрузка…
Отмена
Сохранить